Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 552f764fc809b9d9a9b3038af8cd2f65922cafc4..ccda8bc1afda4d0615945f947f9c092e17dc0997 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -20,6 +20,8 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 

+class WXDLLEXPORT wxWindowDisabler;
+

 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {


@@ -70,17 +72,13 @@ public:
     // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 
     // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 

-    // wxMSW only: remove the "Close" button from the dialog
-    bool EnableCloseButton(bool enable = TRUE);
-

     // implementation only from now on
     // -------------------------------
 
     // override some base class virtuals
     // implementation only from now on
     // -------------------------------
 
     // override some base class virtuals

-    virtual bool Show(bool show);
+    virtual bool Show(bool show = TRUE);

 
     // event handlers
 
     // event handlers

-    bool OnClose();

     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 


@@ -101,6 +99,12 @@ public:
 #endif // wxUSE_CTL3D
 
 protected:
 #endif // wxUSE_CTL3D
 
 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();
 
     // show modal dialog and enter modal loop
     void DoShowModal();
 


@@ -112,10 +116,11 @@ private:
 
     // while we are showing a modal dialog we disable the other windows using
     // this object
 
     // while we are showing a modal dialog we disable the other windows using
     // this object

-    class wxWindowDisabler *m_windowDisabler;
+    wxWindowDisabler *m_windowDisabler;

 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDialog)

 };
 
 #endif
 };
 
 #endif