X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..15f7c30516facfb272fc116aec4d3f9c3a9de085:/include/wx/msw/dialog.h?ds=inline diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 13c8c2b59a..b228a6b477 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -14,13 +14,13 @@ #include "wx/panel.h" -extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[]; -class WXDLLEXPORT wxDialogModalData; +class WXDLLIMPEXP_FWD_CORE wxDialogModalData; #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) -class WXDLLEXPORT wxToolBar; -extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; +class WXDLLIMPEXP_FWD_CORE wxToolBar; +extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[]; #endif // Dialog boxes @@ -85,18 +85,6 @@ public: virtual void Raise(); - // event handlers - void OnCharHook(wxKeyEvent& event); - void OnCloseWindow(wxCloseEvent& event); - - // Standard buttons - void OnOK(wxCommandEvent& event); - void OnApply(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - #ifdef __POCKETPC__ // Responds to the OK button in a PocketPC titlebar. This // can be overridden, or you can change the id used for @@ -108,22 +96,6 @@ public: // Windows callbacks WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - // obsolete methods - // ---------------- - - // use the other ctor - wxDEPRECATED( wxDialog(wxWindow *parent, - const wxString& title, bool modal, - int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) ); - - // just call Show() or ShowModal() - wxDEPRECATED( void SetModal(bool flag) ); - - // use IsModal() - wxDEPRECATED( bool IsModalShowing() const ); - protected: // find the window to use as parent for this dialog if none has been // specified explicitly by the user @@ -134,17 +106,6 @@ protected: // common part of all ctors void Init(); - // 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); - - // handle Escape here - virtual bool MSWProcessMessage(WXMSG* pMsg); - private: wxWindow* m_oldFocus; bool m_endModalCalled; // allow for closing within InitDialog @@ -157,7 +118,6 @@ private: wxDialogModalData *m_modalData; DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxDialog) };