Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index ff51c4bdcf5f34cdd79d0f2b676c79907f6b4d52..5fb90d68c31789463d1caa691358f9f6d78ab44e 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -23,10 +23,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-
 public:
-    wxDialog();
+    wxDialog() { Init(); }
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
@@ -84,6 +82,9 @@ public:
     bool Iconized() const { return IsIconized(); };
 #endif
 
+    // wxMSW only: remove the "Close" button from the dialog
+    bool EnableCloseButton(bool enable = TRUE);
+
     // implementation only from now on
     // -------------------------------
 
@@ -116,9 +117,17 @@ protected:
     // show modal dialog and enter modal loop
     void DoShowModal();
 
+    // common part of all ctors
+    void Init();
+
 private:
     wxWindow *m_oldFocus;
 
+    // while we are showing a modal dialog we disable the other windows using
+    // this object
+    class wxWindowDisabler *m_windowDisabler;
+
+    DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
 };