Skip to content

Commit 9da1274

Browse files
eraniferanif
committed
Refactor Quick Find Bar to Use wxFrame Instead of wxDialog
 Generated by CodeLite. Signed-off-by: Eran Ifrah <eran@codelite.org>
1 parent daf77af commit 9da1274

File tree

5 files changed

+109
-88
lines changed

5 files changed

+109
-88
lines changed

‎LiteEditor/quickfindbar.cpp‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "bitmap_loader.h"
3131
#include "bookmark_manager.h"
3232
#include "clSystemSettings.h"
33-
#include "clThemedTextCtrl.hpp"
3433
#include "cl_command_event.h"
3534
#include "cl_config.h"
3635
#include "cl_editor.h"
@@ -110,7 +109,7 @@ void CenterLine(wxStyledTextCtrl* ctrl, int start_pos, int end_pos)
110109
} // namespace
111110

112111
QuickFindBar::QuickFindBar(wxWindow* parent, wxWindowID id)
113-
: clFindReplaceDialogBase(parent, id)
112+
: FindAndReplaceDialogFrameBase(parent, id)
114113
, m_sci(NULL)
115114
, m_lastTextPtr(NULL)
116115
, m_eventsConnected(false)
@@ -121,7 +120,7 @@ QuickFindBar::QuickFindBar(wxWindow* parent, wxWindowID id)
121120
, m_inSelection(false)
122121
{
123122
Hide();
124-
123+
SetIcons(wxArtProvider::GetIconBundle(wxART_FIND, wxART_FRAME_ICON));
125124
m_toolbar->SetMiniToolBar(true);
126125

127126
auto bitmaps = clGetManager()->GetStdIcons();
@@ -463,7 +462,7 @@ bool QuickFindBar::DoShow(bool s, const wxString& findWhat, bool showReplace)
463462
Move(wxNOT_FOUND, GetParent()->GetPosition().y);
464463
}
465464

466-
bool res = wxDialog::Show(s);
465+
bool res = wxFrame::Show(s);
467466
if (s && m_sci) {
468467
// Delete the indicators
469468
m_sci->SetIndicatorCurrent(1);
@@ -999,7 +998,7 @@ void QuickFindBar::OnPaint(wxPaintEvent& e)
999998

1000999
void QuickFindBar::ShowToolBarOnly()
10011000
{
1002-
wxDialog::Show();
1001+
wxFrame::Show();
10031002
wxSizer* sz = m_textCtrlFind->GetContainingSizer();
10041003
if (sz && sz != GetSizer()) {
10051004
GetSizer()->Hide(sz);
@@ -1087,6 +1086,7 @@ TargetRange QuickFindBar::GetBestTargetRange() const
10871086
return {0, static_cast<int>(m_sci->GetLastPosition())};
10881087
}
10891088
}
1089+
10901090
void QuickFindBar::OnReplaceTextEnter(wxCommandEvent& event) {}
10911091
void QuickFindBar::OnReplaceTextUpdated(wxCommandEvent& event) {}
10921092

@@ -1186,3 +1186,9 @@ void QuickFindBar::ShowMenuForReplaceCtrl()
11861186

11871187
TextCtrlShowMenu(m_textCtrlReplace, menu);
11881188
}
1189+
1190+
void QuickFindBar::OnCloseWindow(wxCloseEvent& event)
1191+
{
1192+
wxUnusedVar(event);
1193+
Hide();
1194+
}

‎LiteEditor/quickfindbar.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
//////////////////////////////////////////////////////////////////////////////
2525
#pragma once
2626

27-
#include "clTerminalHistory.h"
28-
#include "clThemedTextCtrl.hpp"
2927
#include "quickfindbarbase.h"
3028
#include "wxTerminalCtrl/wxTerminalHistory.hpp"
3129

@@ -66,7 +64,7 @@ struct TargetRange {
6664
typedef std::vector<TargetRange> Vec_t;
6765
};
6866

69-
class QuickFindBar : public clFindReplaceDialogBase
67+
class QuickFindBar : public FindAndReplaceDialogFrameBase
7068
{
7169
public:
7270
enum eRegexType {
@@ -76,9 +74,11 @@ class QuickFindBar : public clFindReplaceDialogBase
7674
};
7775

7876
protected:
79-
virtual void OnReplaceTextUI(wxUpdateUIEvent& event);
80-
virtual void OnReplaceTextEnter(wxCommandEvent& event);
81-
virtual void OnReplaceTextUpdated(wxCommandEvent& event);
77+
void OnCloseWindow(wxCloseEvent& event) override;
78+
void OnReplaceTextUI(wxUpdateUIEvent& event);
79+
void OnReplaceTextEnter(wxCommandEvent& event) override;
80+
void OnReplaceTextUpdated(wxCommandEvent& event) override;
81+
8282
enum eFindFlags {
8383
FIND_DEFAULT = 0,
8484
FIND_PREV = (1 << 0),
@@ -101,14 +101,14 @@ class QuickFindBar : public clFindReplaceDialogBase
101101
wxTerminalHistory m_replaceHistory;
102102

103103
protected:
104-
virtual void OnButtonKeyDown(wxKeyEvent& event);
105-
virtual void OnReplaceAllUI(wxUpdateUIEvent& event);
106-
virtual void OnReplaceUI(wxUpdateUIEvent& event);
107-
virtual void OnFind(wxCommandEvent& event);
108-
virtual void OnFindAllUI(wxUpdateUIEvent& event);
109-
virtual void OnFindPrev(wxCommandEvent& event);
110-
virtual void OnFindPrevUI(wxUpdateUIEvent& event);
111-
virtual void OnFindUI(wxUpdateUIEvent& event);
104+
void OnButtonKeyDown(wxKeyEvent& event) override;
105+
void OnReplaceAllUI(wxUpdateUIEvent& event) override;
106+
void OnReplaceUI(wxUpdateUIEvent& event) override;
107+
void OnFind(wxCommandEvent& event) override;
108+
void OnFindAllUI(wxUpdateUIEvent& event) override;
109+
void OnFindPrev(wxCommandEvent& event) override;
110+
void OnFindPrevUI(wxUpdateUIEvent& event) override;
111+
void OnFindUI(wxUpdateUIEvent& event) override;
112112

113113
/**
114114
* @brief find text in the editor the select it
@@ -155,7 +155,7 @@ class QuickFindBar : public clFindReplaceDialogBase
155155
void DoReplaceAll(bool selectionOnly);
156156

157157
protected:
158-
virtual void OnReplaceKeyDown(wxKeyEvent& event);
158+
void OnReplaceKeyDown(wxKeyEvent& event) override;
159159

160160
// replace the current target
161161
// returns the length of the replacement text
@@ -177,12 +177,12 @@ class QuickFindBar : public clFindReplaceDialogBase
177177

178178
// Control events
179179
void OnHide(wxCommandEvent& e);
180-
void OnFindAll(wxCommandEvent& e);
181-
void OnText(wxCommandEvent& e);
182-
void OnKeyDown(wxKeyEvent& e);
183-
void OnReplaceAll(wxCommandEvent& e);
184-
void OnEnter(wxCommandEvent& e);
185-
void OnReplace(wxCommandEvent& e);
180+
void OnFindAll(wxCommandEvent& e) override;
181+
void OnText(wxCommandEvent& e) override;
182+
void OnKeyDown(wxKeyEvent& e) override;
183+
void OnReplaceAll(wxCommandEvent& e) override;
184+
void OnEnter(wxCommandEvent& e) override;
185+
void OnReplace(wxCommandEvent& e) override;
186186
void OnUpdateUI(wxUpdateUIEvent& e);
187187
void OnReplaceEnter(wxCommandEvent& e);
188188
void OnQuickFindCommandEvent(wxCommandEvent& event);
@@ -208,7 +208,7 @@ class QuickFindBar : public clFindReplaceDialogBase
208208
virtual ~QuickFindBar();
209209

210210
bool ShowForPlugins();
211-
bool Show(bool s = true);
211+
bool Show(bool s = true) override;
212212
bool Show(const wxString& findWhat, bool showReplace);
213213
wxStyledTextCtrl* GetEditor() { return m_sci; }
214214
void SetEditor(wxStyledTextCtrl* sci);

‎LiteEditor/quickfindbarbase.cpp‎

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ QuickFindBarImages::QuickFindBarImages()
209209

210210
QuickFindBarImages::~QuickFindBarImages() {}
211211

212-
clFindReplaceDialogBase::clFindReplaceDialogBase(
212+
FindAndReplaceDialogFrameBase::FindAndReplaceDialogFrameBase(
213213
wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style)
214-
: wxDialog(parent, id, title, pos, size, style)
214+
: wxFrame(parent, id, title, pos, size, style)
215215
{
216216
if (!bBitmapLoaded) {
217217
// We need to initialise the default bitmap handler
@@ -286,7 +286,7 @@ clFindReplaceDialogBase::clFindReplaceDialogBase(
286286

287287
flexGridSizer107->Add(m_buttonReplaceAll, 0, wxALL | wxEXPAND, WXC_FROM_DIP(2));
288288

289-
SetName(wxT("clFindReplaceDialogBase"));
289+
SetName(wxT("FindAndReplaceDialogFrameBase"));
290290
SetSize(wxDLG_UNIT(this, wxSize(-1, -1)));
291291
if (GetSizer()) {
292292
GetSizer()->Fit(this);
@@ -302,50 +302,52 @@ clFindReplaceDialogBase::clFindReplaceDialogBase(
302302
wxPersistenceManager::Get().Restore(this);
303303
}
304304
// Connect events
305-
m_textCtrlFind->Bind(wxEVT_COMMAND_TEXT_ENTER, &clFindReplaceDialogBase::OnEnter, this);
306-
m_textCtrlFind->Bind(wxEVT_COMMAND_TEXT_UPDATED, &clFindReplaceDialogBase::OnText, this);
307-
m_textCtrlFind->Bind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnKeyDown, this);
308-
m_buttonFind->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnFind, this);
309-
m_buttonFind->Bind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnFindUI, this);
310-
m_buttonFind->Bind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
311-
m_buttonFindPrev->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnFindPrev, this);
312-
m_buttonFindPrev->Bind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnFindPrevUI, this);
313-
m_buttonFindPrev->Bind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
314-
m_buttonFindAll->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnFindAll, this);
315-
m_buttonFindAll->Bind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnFindAllUI, this);
316-
m_buttonFindAll->Bind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
317-
m_textCtrlReplace->Bind(wxEVT_COMMAND_TEXT_UPDATED, &clFindReplaceDialogBase::OnReplaceTextUpdated, this);
318-
m_textCtrlReplace->Bind(wxEVT_COMMAND_TEXT_ENTER, &clFindReplaceDialogBase::OnReplaceTextEnter, this);
319-
m_textCtrlReplace->Bind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnReplaceKeyDown, this);
320-
m_buttonReplace->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnReplace, this);
321-
m_buttonReplace->Bind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnReplaceUI, this);
322-
m_buttonReplace->Bind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
323-
m_buttonReplaceAll->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnReplaceAll, this);
324-
m_buttonReplaceAll->Bind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnReplaceAllUI, this);
325-
m_buttonReplaceAll->Bind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
305+
this->Bind(wxEVT_CLOSE_WINDOW, &FindAndReplaceDialogFrameBase::OnCloseWindow, this);
306+
m_textCtrlFind->Bind(wxEVT_COMMAND_TEXT_ENTER, &FindAndReplaceDialogFrameBase::OnEnter, this);
307+
m_textCtrlFind->Bind(wxEVT_COMMAND_TEXT_UPDATED, &FindAndReplaceDialogFrameBase::OnText, this);
308+
m_textCtrlFind->Bind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnKeyDown, this);
309+
m_buttonFind->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnFind, this);
310+
m_buttonFind->Bind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnFindUI, this);
311+
m_buttonFind->Bind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
312+
m_buttonFindPrev->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnFindPrev, this);
313+
m_buttonFindPrev->Bind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnFindPrevUI, this);
314+
m_buttonFindPrev->Bind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
315+
m_buttonFindAll->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnFindAll, this);
316+
m_buttonFindAll->Bind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnFindAllUI, this);
317+
m_buttonFindAll->Bind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
318+
m_textCtrlReplace->Bind(wxEVT_COMMAND_TEXT_UPDATED, &FindAndReplaceDialogFrameBase::OnReplaceTextUpdated, this);
319+
m_textCtrlReplace->Bind(wxEVT_COMMAND_TEXT_ENTER, &FindAndReplaceDialogFrameBase::OnReplaceTextEnter, this);
320+
m_textCtrlReplace->Bind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnReplaceKeyDown, this);
321+
m_buttonReplace->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnReplace, this);
322+
m_buttonReplace->Bind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnReplaceUI, this);
323+
m_buttonReplace->Bind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
324+
m_buttonReplaceAll->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnReplaceAll, this);
325+
m_buttonReplaceAll->Bind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnReplaceAllUI, this);
326+
m_buttonReplaceAll->Bind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
326327
}
327328

328-
clFindReplaceDialogBase::~clFindReplaceDialogBase()
329+
FindAndReplaceDialogFrameBase::~FindAndReplaceDialogFrameBase()
329330
{
330-
m_textCtrlFind->Unbind(wxEVT_COMMAND_TEXT_ENTER, &clFindReplaceDialogBase::OnEnter, this);
331-
m_textCtrlFind->Unbind(wxEVT_COMMAND_TEXT_UPDATED, &clFindReplaceDialogBase::OnText, this);
332-
m_textCtrlFind->Unbind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnKeyDown, this);
333-
m_buttonFind->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnFind, this);
334-
m_buttonFind->Unbind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnFindUI, this);
335-
m_buttonFind->Unbind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
336-
m_buttonFindPrev->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnFindPrev, this);
337-
m_buttonFindPrev->Unbind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnFindPrevUI, this);
338-
m_buttonFindPrev->Unbind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
339-
m_buttonFindAll->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnFindAll, this);
340-
m_buttonFindAll->Unbind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnFindAllUI, this);
341-
m_buttonFindAll->Unbind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
342-
m_textCtrlReplace->Unbind(wxEVT_COMMAND_TEXT_UPDATED, &clFindReplaceDialogBase::OnReplaceTextUpdated, this);
343-
m_textCtrlReplace->Unbind(wxEVT_COMMAND_TEXT_ENTER, &clFindReplaceDialogBase::OnReplaceTextEnter, this);
344-
m_textCtrlReplace->Unbind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnReplaceKeyDown, this);
345-
m_buttonReplace->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnReplace, this);
346-
m_buttonReplace->Unbind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnReplaceUI, this);
347-
m_buttonReplace->Unbind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
348-
m_buttonReplaceAll->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &clFindReplaceDialogBase::OnReplaceAll, this);
349-
m_buttonReplaceAll->Unbind(wxEVT_UPDATE_UI, &clFindReplaceDialogBase::OnReplaceAllUI, this);
350-
m_buttonReplaceAll->Unbind(wxEVT_KEY_DOWN, &clFindReplaceDialogBase::OnButtonKeyDown, this);
331+
this->Unbind(wxEVT_CLOSE_WINDOW, &FindAndReplaceDialogFrameBase::OnCloseWindow, this);
332+
m_textCtrlFind->Unbind(wxEVT_COMMAND_TEXT_ENTER, &FindAndReplaceDialogFrameBase::OnEnter, this);
333+
m_textCtrlFind->Unbind(wxEVT_COMMAND_TEXT_UPDATED, &FindAndReplaceDialogFrameBase::OnText, this);
334+
m_textCtrlFind->Unbind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnKeyDown, this);
335+
m_buttonFind->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnFind, this);
336+
m_buttonFind->Unbind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnFindUI, this);
337+
m_buttonFind->Unbind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
338+
m_buttonFindPrev->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnFindPrev, this);
339+
m_buttonFindPrev->Unbind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnFindPrevUI, this);
340+
m_buttonFindPrev->Unbind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
341+
m_buttonFindAll->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnFindAll, this);
342+
m_buttonFindAll->Unbind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnFindAllUI, this);
343+
m_buttonFindAll->Unbind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
344+
m_textCtrlReplace->Unbind(wxEVT_COMMAND_TEXT_UPDATED, &FindAndReplaceDialogFrameBase::OnReplaceTextUpdated, this);
345+
m_textCtrlReplace->Unbind(wxEVT_COMMAND_TEXT_ENTER, &FindAndReplaceDialogFrameBase::OnReplaceTextEnter, this);
346+
m_textCtrlReplace->Unbind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnReplaceKeyDown, this);
347+
m_buttonReplace->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnReplace, this);
348+
m_buttonReplace->Unbind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnReplaceUI, this);
349+
m_buttonReplace->Unbind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
350+
m_buttonReplaceAll->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FindAndReplaceDialogFrameBase::OnReplaceAll, this);
351+
m_buttonReplaceAll->Unbind(wxEVT_UPDATE_UI, &FindAndReplaceDialogFrameBase::OnReplaceAllUI, this);
352+
m_buttonReplaceAll->Unbind(wxEVT_KEY_DOWN, &FindAndReplaceDialogFrameBase::OnButtonKeyDown, this);
351353
}

‎LiteEditor/quickfindbarbase.h‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <wx/bitmap.h>
2121
#include <map>
2222
#include <wx/icon.h>
23-
#include <wx/dialog.h>
23+
#include <wx/frame.h>
2424
#include <wx/iconbndl.h>
2525
#include <wx/toolbar.h>
2626
#include "clToolBar.h"
@@ -94,7 +94,7 @@ class QuickFindBarImages : public wxImageList
9494
virtual ~QuickFindBarImages();
9595
};
9696

97-
class clFindReplaceDialogBase : public wxDialog
97+
class FindAndReplaceDialogFrameBase : public wxFrame
9898
{
9999
public:
100100
enum {
@@ -113,6 +113,7 @@ class clFindReplaceDialogBase : public wxDialog
113113
wxButton* m_buttonReplaceAll;
114114

115115
protected:
116+
virtual void OnCloseWindow(wxCloseEvent& event) { event.Skip(); }
116117
virtual void OnEnter(wxCommandEvent& event) { event.Skip(); }
117118
virtual void OnText(wxCommandEvent& event) { event.Skip(); }
118119
virtual void OnKeyDown(wxKeyEvent& event) { event.Skip(); }
@@ -141,13 +142,14 @@ class clFindReplaceDialogBase : public wxDialog
141142
wxButton* GetButtonReplace() { return m_buttonReplace; }
142143
wxButton* GetButtonReplaceAll() { return m_buttonReplaceAll; }
143144
wxPanel* GetMainPanel() { return m_mainPanel; }
144-
clFindReplaceDialogBase(wxWindow* parent,
145-
wxWindowID id = wxID_ANY,
146-
const wxString& title = _("Find / Replace"),
147-
const wxPoint& pos = wxDefaultPosition,
148-
const wxSize& size = wxSize(-1, -1),
149-
long style = wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP | wxRESIZE_BORDER);
150-
virtual ~clFindReplaceDialogBase();
145+
FindAndReplaceDialogFrameBase(wxWindow* parent,
146+
wxWindowID id = wxID_ANY,
147+
const wxString& title = _("Find & Replace"),
148+
const wxPoint& pos = wxDefaultPosition,
149+
const wxSize& size = wxSize(-1, -1),
150+
long style = wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxCAPTION |
151+
wxRESIZE_BORDER | wxCLOSE_BOX);
152+
virtual ~FindAndReplaceDialogFrameBase();
151153
};
152154

153155
#endif

‎LiteEditor/quickfindbarbase.wxcp‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"metadata": {
33
"m_generatedFilesDir": ".",
4-
"m_objCounter": 179,
4+
"m_objCounter": 192,
55
"m_includeFiles": [],
66
"m_bitmapFunction": "wxCrafteryhjh4ZInitBitmapResources",
77
"m_bitmapsFile": "quickfindbarbase_liteeditor_bitmaps.cpp",
@@ -799,12 +799,12 @@
799799
"m_children": []
800800
}]
801801
}, {
802-
"m_type": 4421,
802+
"m_type": 4402,
803803
"proportion": 0,
804804
"border": 5,
805805
"gbSpan": "1,1",
806806
"gbPosition": "0,0",
807-
"m_styles": ["wxDEFAULT_DIALOG_STYLE", "wxSTAY_ON_TOP", "wxRESIZE_BORDER"],
807+
"m_styles": ["wxFRAME_NO_TASKBAR", "wxFRAME_FLOAT_ON_PARENT", "wxCAPTION", "wxRESIZE_BORDER", "wxCLOSE_BOX"],
808808
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
809809
"m_properties": [{
810810
"type": "string",
@@ -817,7 +817,7 @@
817817
}, {
818818
"type": "string",
819819
"m_label": "Name:",
820-
"m_value": "clFindReplaceDialogBase"
820+
"m_value": "FindAndReplaceDialogFrameBase"
821821
}, {
822822
"type": "multi-string",
823823
"m_label": "Tooltip:",
@@ -865,7 +865,7 @@
865865
}, {
866866
"type": "string",
867867
"m_label": "Title:",
868-
"m_value": "Find / Replace"
868+
"m_value": "Find & Replace"
869869
}, {
870870
"type": "virtualFolderPicker",
871871
"m_label": "Virtual Folder:",
@@ -887,6 +887,11 @@
887887
"type": "string",
888888
"m_label": "Class Decorator",
889889
"m_value": ""
890+
}, {
891+
"type": "choice",
892+
"m_label": "wxFrame Type",
893+
"m_selection": 0,
894+
"m_options": ["wxFrame", "wxDocMDIParentFrame", "wxDocMDIChildFrame", "wxDocParentFrame", "wxDocChildFrame", "wxMiniFrame"]
890895
}, {
891896
"type": "bitmapPicker",
892897
"m_label": "Bitmap File (16x16) :",
@@ -908,7 +913,13 @@
908913
"m_label": "Bitmap File (256x256):",
909914
"m_path": ""
910915
}],
911-
"m_events": [],
916+
"m_events": [{
917+
"m_eventName": "wxEVT_CLOSE_WINDOW",
918+
"m_eventClass": "wxCloseEvent",
919+
"m_functionNameAndSignature": "OnCloseWindow(wxCloseEvent& event)",
920+
"m_description": "Process a close event. This event applies to wxFrame and wxDialog classes",
921+
"m_noBody": false
922+
}],
912923
"m_children": [{
913924
"m_type": 4401,
914925
"proportion": 1,

0 commit comments

Comments
 (0)