Reworked Frame class

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 82334eb479ce25683047e82e079291b8c6dcd2bc..c9968337278b45a7bcdbec7b5343910d4c7ebac3 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -35,10 +35,8 @@ extern const wxChar *wxDialogNameStr;
 // wxDialog
 //-----------------------------------------------------------------------------
 
 // wxDialog
 //-----------------------------------------------------------------------------
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
     wxDialog() { Init(); }
     wxDialog( wxWindow *parent, wxWindowID id,
 public:
     wxDialog() { Init(); }
     wxDialog( wxWindow *parent, wxWindowID id,


@@ -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,11 +83,15 @@ public:
     virtual void Maximize() { }
     virtual void Restore() { }
 
     virtual void Maximize() { }
     virtual void Restore() { }
 

-    void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
-    int GetReturnCode() const { return m_returnCode; }
-
+    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();
 


@@ -108,9 +108,8 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
 
 private:
                            int sizeFlags = wxSIZE_AUTO);
 
 private:

-    int m_returnCode;
-

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDialog)

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