Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 91dd0fc5640433cf2b819478a14e9da791343109..8e799611ff33c66f5f57b5328c2ec42cd74809d5 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -14,17 +14,26 @@
 
 #include "wx/panel.h"
 
 
 #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__))
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))

-class WXDLLEXPORT wxToolBar;
-extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];

 #endif
 
 // Dialog boxes
 #endif
 
 // Dialog boxes

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

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


@@ -83,19 +92,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();
-
-    // 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);
+#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
 
 #ifdef __POCKETPC__
     // Responds to the OK button in a PocketPC titlebar. This


@@ -108,46 +107,26 @@ public:
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // 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:
 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();
 

-    // end either modal or modeless dialog
-    void EndDialog(int rc);
-
-    // emulate click of a button with the given id if it's present in the dialog
-    //
-    // return true if button was "clicked" or false if we don't have it
-    bool EmulateButtonClickIfPresent(int id);
-
-    // handle Escape here
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
-

 private:
 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;
 
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     wxToolBar*  m_dialogToolBar;


@@ -157,8 +136,7 @@ private:
     wxDialogModalData *m_modalData;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     wxDialogModalData *m_modalData;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)

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

 };
 
 #endif
 };
 
 #endif