X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d71cc120e315b27466cce577115b9bdf56b1ca55..3dccf96eabc68d95839782d35e6193855f007fd2:/include/wx/msw/dialog.h?ds=sidebyside diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index aae10aa23e..b8c0fb857f 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -12,16 +12,17 @@ #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dialog.h" -#endif - #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; class WXDLLEXPORT wxDialogModalData; +#if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) +class WXDLLEXPORT wxToolBar; +extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; +#endif + // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase { @@ -59,6 +60,23 @@ 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, + wxWindowID winid = wxID_ANY, + const wxString& name = wxToolBarNameStr); + // return a new toolbar + virtual wxToolBar *OnCreateToolBar(long style, + wxWindowID winid, + const wxString& name ); + + // get the main toolbar + wxToolBar *GetToolBar() const { return m_dialogToolBar; } +#endif // wxUSE_TOOLBAR && __POCKETPC__ + + // implementation only from now on // ------------------------------- @@ -67,29 +85,18 @@ 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 + // sending the event with SetAffirmativeId. Returns false + // if the event was not processed. + virtual bool DoOK(); +#endif // Windows callbacks WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); -#if wxUSE_CTL3D - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); -#endif // wxUSE_CTL3D - - // obsolete methods - // ---------------- - +#if WXWIN_COMPATIBILITY_2_6 // use the other ctor wxDEPRECATED( wxDialog(wxWindow *parent, const wxString& title, bool modal, @@ -102,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 @@ -113,19 +121,18 @@ 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 +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + wxToolBar* m_dialogToolBar; +#endif + // this pointer is non-NULL only while the modal event loop is running wxDialogModalData *m_modalData; - DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() DECLARE_NO_COPY_CLASS(wxDialog) };