compilation fix

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 002c3e1beddd9b8c4c1a63ae7505772e3e51001c..2d33f945d08186ab4560f5ce794af678cf07bc42 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -29,18 +29,16 @@ class wxDialog;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxDialogNameStr;
+extern const wxChar *wxDialogNameStr;

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

-class wxDialog: public wxPanel
+class wxDialog: public wxDialogBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
 public:

-    wxDialog();
+    wxDialog() { Init(); }

     wxDialog( wxWindow *parent, wxWindowID id,
             const wxString &title,
             const wxPoint &pos = wxDefaultPosition,
     wxDialog( wxWindow *parent, wxWindowID id,
             const wxString &title,
             const wxPoint &pos = wxDefaultPosition,


@@ -70,7 +68,7 @@ public:
 
     bool Destroy();
 
 
     bool Destroy();
 

-    virtual bool Show( bool show );
+    virtual bool Show( bool show = TRUE );

     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;


@@ -78,8 +76,6 @@ public:
 
     virtual void InitDialog(void);
 
 
     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; }
     virtual void SetIcon( const wxIcon &icon );
     virtual void Iconize( bool WXUNUSED(iconize)) { }
     virtual bool IsIconized() const { return FALSE; }


@@ -87,8 +83,15 @@ public:
     virtual void Maximize() { }
     virtual void Restore() { }
 
     virtual void Maximize() { }
     virtual void Restore() { }
 

+    virtual bool IsTopLevel() const { return TRUE; }
+    

     // implementation
     // implementation

+    // --------------

 
 

+    // move the window to the specified location and resize it: this is called
+    // from both DoSetSize() and DoSetClientSize()
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    

     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 


@@ -97,12 +100,19 @@ public:
     wxIcon     m_icon;
 
 protected:
     wxIcon     m_icon;
 
 protected:

+    // common part of all ctors
+    void Init();
+
+    // common part of Destroy() and ~wxDialog
+    void CleanUp();
+

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
 private:
     DECLARE_EVENT_TABLE()
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDialog)

 };
 
 #endif // __GTKDIALOGH__
 };
 
 #endif // __GTKDIALOGH__