X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a6739128bcb9b5b68f0c2e74170ef62663b3a7..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/dialog.h?ds=sidebyside diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index c53c8b7426..8e799611ff 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -14,6 +14,15 @@ #include "wx/panel.h" +// 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 WXDLLIMPEXP_FWD_CORE wxDialogModalData; @@ -83,9 +92,9 @@ public: // override some base class virtuals virtual bool Show(bool show = true); - virtual void Raise(); - +#if wxUSE_DIALOG_SIZEGRIP virtual void SetWindowStyleFlag(long style); +#endif // wxUSE_DIALOG_SIZEGRIP #ifdef __POCKETPC__ // Responds to the OK button in a PocketPC titlebar. This @@ -99,28 +108,25 @@ public: WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); 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(); +private: +#if wxUSE_DIALOG_SIZEGRIP // these functions deal with the gripper window shown in the corner of - // resizeable dialogs + // resizable dialogs void CreateGripper(); void DestroyGripper(); void ShowGripper(bool show); void ResizeGripper(); -private: // this function is used to adjust Z-order of new children relative to the // gripper if we have one void OnWindowCreate(wxWindowCreateEvent& event); - bool m_endModalCalled; // allow for closing within InitDialog + // 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; @@ -129,11 +135,8 @@ private: // this pointer is non-NULL only while the modal event loop is running wxDialogModalData *m_modalData; - // gripper window for a resizable dialog, NULL if we're not resizable - WXHWND m_hGripper; - DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_NO_COPY_CLASS(wxDialog) + wxDECLARE_NO_COPY_CLASS(wxDialog); }; #endif