Applied patch [ 1181975 ] [wxMSW] Removes all flicker from wxNotebook

[wxWidgets.git] / include / wx / mac / carbon / dialog.h

diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index e6834011c5979fc6bf71b51d62d69016a9e6717f..5a5a28675ff2ea0b4f4d7d096f26133bd006434e 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:

-    wxDialog();
+    wxDialog() { Init(); }

 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,


@@ -39,9 +39,10 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
+        Init();
+        m_isModalStyle = modal;

         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),

-               style | modalStyle, name);
+               style, name);

     }
 
     // Constructor with no modal flag - the new convention.
     }
 
     // Constructor with no modal flag - the new convention.


@@ -52,6 +53,7 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

+        Init();

         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 


@@ -65,7 +67,7 @@ public:
     ~wxDialog();
 
 //    virtual bool Destroy();
     ~wxDialog();
 
 //    virtual bool Destroy();

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

 
     void SetModal(bool flag);
     virtual bool IsModal() const;
 
     void SetModal(bool flag);
     virtual bool IsModal() const;


@@ -98,6 +100,8 @@ public:
     void DoShowModal();
 
 private:
     void DoShowModal();
 
 private:

+    void Init();
+    bool m_isModalStyle;

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };