move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 6aac74cb964cd606ed20dec390e945c6e9e50d0c..fb78c8c440323c5fa57dbe2c2bcef9c8bf3fe1f9 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -11,20 +11,6 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 

-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDialog;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];
-

 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------


@@ -45,7 +31,7 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );

-    ~wxDialog() {}
+    virtual ~wxDialog() {}

 
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );
 
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );