Avoid id clashes

[wxWidgets.git] / include / wx / msw / dialog.h

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 98b19aec79767a4cfcce98120ff54fff3c1590fb..e0274ff14a5b9bd49961eb93d2a60b268aa25210 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -14,6 +14,15 @@
 
 #include "wx/panel.h"
 
 
 #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 resizeable 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;
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxDialogModalData;


@@ -99,15 +108,11 @@ public:
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
     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();
 
     // 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
     void CreateGripper();
     // these functions deal with the gripper window shown in the corner of
     // resizeable dialogs
     void CreateGripper();


@@ -115,11 +120,14 @@ protected:
     void ShowGripper(bool show);
     void ResizeGripper();
 
     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);
 
     // 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;
 #endif
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     wxToolBar*  m_dialogToolBar;
 #endif


@@ -127,11 +135,8 @@ private:
     // this pointer is non-NULL only while the modal event loop is running
     wxDialogModalData *m_modalData;
 
     // 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_DYNAMIC_CLASS(wxDialog)

-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);

 };
 
 #endif
 };
 
 #endif