X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f55fee08e9d56f3994e0af75efe179d14a6258e7..d8af5b3aadd90a5348855b8bb66f979413380ca2:/include/wx/msw/dialog.h diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 3d8cfa3cc2..3f128f4120 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -12,18 +12,15 @@ #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 WXDLLEXPORT_DATA(const wxChar) 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 WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; #endif // Dialog boxes @@ -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,9 +96,7 @@ public: // Windows callbacks WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - // obsolete methods - // ---------------- - +#if WXWIN_COMPATIBILITY_2_6 // use the other ctor wxDEPRECATED( wxDialog(wxWindow *parent, const wxString& title, bool modal, @@ -123,6 +109,7 @@ public: // use IsModal() wxDEPRECATED( bool IsModalShowing() const ); +#endif // WXWIN_COMPATIBILITY_2_6 protected: // find the window to use as parent for this dialog if none has been @@ -134,17 +121,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 +133,6 @@ private: wxDialogModalData *m_modalData; DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxDialog) };