moved duplicated wxRegionContain definitions to wx/region.h

[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 0f8593aae90c1e14cd99abe4aa668ea9e9339fe8..813321910a7ea38c10ba2314786a8ebe0dcf7e36 100644 (file)
--- a/include/wx/mac/classic/dialog.h
+++ b/include/wx/mac/classic/dialog.h
@@ -6,23 +6,17 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dialog.h"
-#endif
-

 #include "wx/panel.h"
 
 #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
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase


@@ -67,7 +61,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;