Rework wxMotif font/color inheritance so it works

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 099dd51d74f371f10cc55f286748fcf17e1fe26d..da34a90902eb1df54f37991af3b8131575dddeb1 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
+// Name:        wx/gtk1/dialog.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:
@@ -11,10 +11,6 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 
 //-----------------------------------------------------------------------------
@@ -27,7 +23,7 @@ class WXDLLIMPEXP_CORE wxDialog;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxDialog
@@ -49,7 +45,7 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
-    ~wxDialog() {}
+    virtual ~wxDialog() {}
 
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );