No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 2ae06386823340820b85f6e151273c21cf1587e2..a5adcebec5b9bfef23b92f01e9bae6ea84d51147 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.h
+// Name:        wx/gtk1/dialog.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Purpose:
 // Author:      Robert Roebling
 // Created:

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,20 +10,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 +30,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 );