correct access for virtuals

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

diff --git a/include/wx/mac/classic/dialog.h b/include/wx/mac/classic/dialog.h
index e6834011c5979fc6bf71b51d62d69016a9e6717f..813321910a7ea38c10ba2314786a8ebe0dcf7e36 100644 (file)
--- a/include/wx/mac/classic/dialog.h
+++ b/include/wx/mac/classic/dialog.h
@@ -12,17 +12,11 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dialog.h"
-#endif
-
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
 
-class WXDLLEXPORT wxMacToolTip ;
+class WXDLLEXPORT wxMacToolTip;
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
@@ -30,7 +24,7 @@ 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,
@@ -39,9 +33,10 @@ public:
              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),
-               style | modalStyle, name);
+               style, name);
     }
 
     // Constructor with no modal flag - the new convention.
@@ -52,6 +47,7 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
+        Init();
         Create(parent, id, title, pos, size, style, name);
     }
 
@@ -65,7 +61,7 @@ public:
     ~wxDialog();
 
 //    virtual bool Destroy();
-    bool Show(bool show = true);
+    virtual bool Show(bool show = true);
 
     void SetModal(bool flag);
     virtual bool IsModal() const;
@@ -98,6 +94,8 @@ public:
     void DoShowModal();
 
 private:
+    void Init();
+    bool m_isModalStyle;
     DECLARE_EVENT_TABLE()
 };