centralized Esc key handling for closing the dialogs in wxDialogBase:
1. added wxDialogBase::OnCharHook() and removed this event handler from all the other ports 2. also removed ad hoc code doing the same thing in wxMSW (MSWProcessMessage() override in wxDialog) and wxGTK (in gtk_window_key_press_callback()) 3. reimplemented EmulateButtonClickIfPresent() portably and also moved it to wxDialogBase from wxMSW wxDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -86,7 +86,6 @@ public:
|
||||
virtual void Raise();
|
||||
|
||||
// event handlers
|
||||
void OnCharHook(wxKeyEvent& event);
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
|
||||
// Standard buttons
|
||||
@@ -123,9 +122,6 @@ public:
|
||||
wxDEPRECATED( bool IsModalShowing() const );
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
// handle Escape here
|
||||
virtual bool MSWProcessMessage(WXMSG* pMsg);
|
||||
|
||||
protected:
|
||||
// find the window to use as parent for this dialog if none has been
|
||||
// specified explicitly by the user
|
||||
@@ -139,11 +135,6 @@ protected:
|
||||
// end either modal or modeless dialog
|
||||
void EndDialog(int rc);
|
||||
|
||||
// emulate click of a button with the given id if it's present in the dialog
|
||||
//
|
||||
// return true if button was "clicked" or false if we don't have it
|
||||
bool EmulateButtonClickIfPresent(int id);
|
||||
|
||||
private:
|
||||
wxWindow* m_oldFocus;
|
||||
bool m_endModalCalled; // allow for closing within InitDialog
|
||||
|
Reference in New Issue
Block a user