Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 51edf8c0716b3f150881da92a92cd90244129b2e..5e6157426a427ee294eba0ddf1e42df28d5ec080 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,7 +15,7 @@
 
 // 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
 
 // 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
+// not resizable and never show resize gripper anyhow so don't use it there

 #ifdef __WXWINCE__
     #define wxUSE_DIALOG_SIZEGRIP 0
 #else
 #ifdef __WXWINCE__
     #define wxUSE_DIALOG_SIZEGRIP 0
 #else


@@ -92,9 +91,9 @@ public:
     // override some base class virtuals
     virtual bool Show(bool show = true);
 
     // override some base class virtuals
     virtual bool Show(bool show = true);
 

-    virtual void Raise();
-
+#if wxUSE_DIALOG_SIZEGRIP

     virtual void SetWindowStyleFlag(long style);
     virtual void SetWindowStyleFlag(long style);

+#endif // wxUSE_DIALOG_SIZEGRIP

 
 #ifdef __POCKETPC__
     // Responds to the OK button in a PocketPC titlebar. This
 
 #ifdef __POCKETPC__
     // Responds to the OK button in a PocketPC titlebar. This


@@ -108,19 +107,13 @@ 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();
 
 private:
 #if wxUSE_DIALOG_SIZEGRIP
     // these functions deal with the gripper window shown in the corner of
     // 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 CreateGripper();
     void DestroyGripper();
     void ShowGripper(bool show);