Second try at doing Set/GetClient right

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 5bd1564976238a294085bef24d6e75e3dd0912d2..f838cbf3bee94e36bf9a928f237038fe32737715 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -3,8 +3,8 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,8 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/event.h"
-#include "wx/window.h"
+#include "wx/panel.h"
+#include "wx/icon.h"

 
 //-----------------------------------------------------------------------------
 // forward decls
 
 //-----------------------------------------------------------------------------
 // forward decls


@@ -44,7 +42,7 @@ extern const char *wxDialogNameStr;
 // wxDialog
 //-----------------------------------------------------------------------------
 
 // wxDialog
 //-----------------------------------------------------------------------------
 

-class wxDialog: public wxWindow
+class wxDialog: public wxPanel

 {
   DECLARE_DYNAMIC_CLASS(wxDialog)
 
 {
   DECLARE_DYNAMIC_CLASS(wxDialog)
 


@@ -73,10 +71,18 @@ class wxDialog: public wxWindow
     virtual bool Show( bool show );
     virtual int ShowModal(void);
     virtual void EndModal(int retCode);
     virtual bool Show( bool show );
     virtual int ShowModal(void);
     virtual void EndModal(int retCode);

-    virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    virtual bool IsModal(void) const;
+    void SetModal( bool modal );

     virtual void InitDialog(void);
     virtual void Centre( int direction = wxHORIZONTAL );
     
     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(void) const { return FALSE; }
+    bool Iconized(void) const { return IsIconized(); }
+    virtual void Maximize(void) { }
+    virtual void Restore(void) { }
+    

   private:
   
     friend    wxWindow;
   private:
   
     friend    wxWindow;


@@ -85,6 +91,7 @@ class wxDialog: public wxWindow
     
     bool       m_modalShowing;
     wxString   m_title;
     
     bool       m_modalShowing;
     wxString   m_title;

+    wxIcon     m_icon;

     
     virtual void ImplementSetPosition();
   
     
     virtual void ImplementSetPosition();