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 7073936cc581311f1234dcc9881693ecb6df0de2..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
 /////////////////////////////////////////////////////////////////////////////


@@ -12,37 +11,33 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dialog.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 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
 
 #endif
 

-#include "wx/panel.h"
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];

 
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+class WXDLLIMPEXP_FWD_CORE wxDialogModalData;

 
 

-class WXDLLEXPORT wxDialogModalData;
+#if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];
+#endif

 
 // Dialog boxes
 
 // Dialog boxes

-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase

 {
 public:
     wxDialog() { Init(); }
 
 {
 public:
     wxDialog() { Init(); }
 

-    // Constructor with a modal flag, but no window id - the old convention
-    wxDialog(wxWindow *parent,
-             const wxString& title, bool modal,
-             int x = -1, int y= -1, int width = 500, int height = 500,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
-    {
-        Init();
-
-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
-               style | modalStyle, name);
-    }
-
-    // Constructor with no modal flag - the new convention.
+    // full ctor

     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,
              const wxPoint& pos = wxDefaultPosition,
     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,
              const wxPoint& pos = wxDefaultPosition,


@@ -64,70 +59,83 @@ public:
 
     virtual ~wxDialog();
 
 
     virtual ~wxDialog();
 

-    void SetModal(bool flag);
-    virtual bool IsModal() const;
+    // return true if we're showing the dialog modally
+    virtual bool IsModal() const { return m_modalData != NULL; }

 
 

-    // For now, same as Show(TRUE) but returns return code
+    // show the dialog modally and return the value passed to EndModal()

     virtual int ShowModal();
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 
     virtual int ShowModal();
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 

-    // returns TRUE if we're in a modal loop
-    bool IsModalShowing() const;
-
-    // implementation only from now on
-    // -------------------------------

 
 

-    // override some base class virtuals
-    virtual bool Show(bool show = TRUE);
+    // 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 );

 
 

-    virtual void Raise();
+    // get the main toolbar
+    wxToolBar *GetToolBar() const { return m_dialogToolBar; }
+#endif // wxUSE_TOOLBAR && __POCKETPC__

 
 

-    // event handlers
-    void OnCharHook(wxKeyEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);

 
 

-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
+    // implementation only from now on
+    // -------------------------------

 
 

-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
+    // override some base class virtuals
+    virtual bool Show(bool show = true);
+
+#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
+    // 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
 
     // Windows callbacks

-    long 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
+    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 
 protected:
 
 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;
-
-    // show modal dialog and enter modal loop
-    void DoShowModal();
-

     // common part of all ctors
     void Init();
 
 private:
     // common part of all ctors
     void Init();
 
 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;
+#endif

 
     // 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;
 

-

     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_DYNAMIC_CLASS(wxDialog)

-    DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);

 };
 
 #endif
 };
 
 #endif