X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec5f0c24123fe801fb82b69771c171c0b9d064fc..f71b0c2d56b03b7823e661aacd05cf1a791e5c2f:/include/wx/msw/dialog.h diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 319cd2bcc4..e29a5e045f 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -12,22 +12,19 @@ #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dialog.h" -#endif - #include "wx/panel.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[]; -class WXDLLEXPORT wxDialogModalData; +class WXDLLIMPEXP_FWD_CORE wxDialogModalData; #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) -class WXDLLEXPORT wxToolBar; +class WXDLLIMPEXP_FWD_CORE wxToolBar; +extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[]; #endif // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { public: wxDialog() { Init(); } @@ -63,6 +60,8 @@ public: // may be called to terminate the dialog with the given return code virtual void EndModal(int retCode); + + // we treat dialog toolbars specially under Windows CE #if wxUSE_TOOLBAR && defined(__POCKETPC__) // create main toolbar by calling OnCreateToolBar() virtual wxToolBar* CreateToolBar(long style = -1, @@ -75,7 +74,8 @@ public: // get the main toolbar wxToolBar *GetToolBar() const { return m_dialogToolBar; } -#endif +#endif // wxUSE_TOOLBAR && __POCKETPC__ + // implementation only from now on // ------------------------------- @@ -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,9 +106,6 @@ protected: // common part of all ctors void Init(); - // end either modal or modeless dialog - void EndDialog(int rc); - private: wxWindow* m_oldFocus; bool m_endModalCalled; // allow for closing within InitDialog @@ -149,7 +118,6 @@ private: wxDialogModalData *m_modalData; DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxDialog) };