Fixed a void* to wxObject* conversion error in a return causing compile break across...

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 62bd45a4cd320f9a233ab85ee72a595b41f5be55..a90b7305f025080bbb13af798ed9d15027a72710 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -29,16 +29,14 @@ class wxDialog;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxDialogNameStr;
+extern const wxChar *wxDialogNameStr;
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
-class wxDialog: public wxPanel
+class wxDialog: public wxDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-
 public:
     wxDialog() { Init(); }
     wxDialog( wxWindow *parent, wxWindowID id,
@@ -78,8 +76,6 @@ public:
 
     virtual void InitDialog(void);
 
-    virtual void Centre( int direction = wxHORIZONTAL );
-
     virtual void SetIcon( const wxIcon &icon );
     virtual void Iconize( bool WXUNUSED(iconize)) { }
     virtual bool IsIconized() const { return FALSE; }
@@ -87,6 +83,8 @@ public:
     virtual void Maximize() { }
     virtual void Restore() { }
 
+    virtual bool IsTopLevel() const { return TRUE; }
+    
     // implementation
 
     virtual void GtkOnSize( int x, int y, int width, int height );
@@ -106,6 +104,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
 #endif // __GTKDIALOGH__