X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec5f0c24123fe801fb82b69771c171c0b9d064fc..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/dialog.h?ds=sidebyside diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 319cd2bcc4..5726427683 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -12,22 +12,28 @@ #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; +// this option is always enabled (there doesn't seem to be any good reason to +// disable it) for desktop Windows versions but Windows CE dialogs are usually +// not resizable and never show resize gripper anyhow so don't use it there +#ifdef __WXWINCE__ + #define wxUSE_DIALOG_SIZEGRIP 0 +#else + #define wxUSE_DIALOG_SIZEGRIP 1 +#endif + +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 +69,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 +83,8 @@ public: // get the main toolbar wxToolBar *GetToolBar() const { return m_dialogToolBar; } -#endif +#endif // wxUSE_TOOLBAR && __POCKETPC__ + // implementation only from now on // ------------------------------- @@ -85,17 +94,7 @@ 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); + virtual void SetWindowStyleFlag(long style); #ifdef __POCKETPC__ // Responds to the OK button in a PocketPC titlebar. This @@ -108,38 +107,26 @@ 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 - // - // may return NULL - wxWindow *FindSuitableParent() const; - // 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_DIALOG_SIZEGRIP + // these functions deal with the gripper window shown in the corner of + // resizable dialogs + void CreateGripper(); + void DestroyGripper(); + void ShowGripper(bool show); + void ResizeGripper(); + + // this function is used to adjust Z-order of new children relative to the + // gripper if we have one + void OnWindowCreate(wxWindowCreateEvent& event); + + // gripper window for a resizable dialog, NULL if we're not resizable + WXHWND m_hGripper; +#endif // wxUSE_DIALOG_SIZEGRIP #if wxUSE_TOOLBAR && defined(__POCKETPC__) wxToolBar* m_dialogToolBar; @@ -149,8 +136,7 @@ private: wxDialogModalData *m_modalData; DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDialog) + wxDECLARE_NO_COPY_CLASS(wxDialog); }; #endif