1. GetNextChild() bug fixed in generic version

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 236b8cc02476a18eb0935fffdc446bf176177a55..f2b65f707a95b9b14a1774a446c66f385dd6daa2 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
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,10 +17,7 @@
 #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"
 
 //-----------------------------------------------------------------------------
@@ -45,7 +42,7 @@ extern const char *wxDialogNameStr;
 // wxDialog
 //-----------------------------------------------------------------------------
 
-class wxDialog: public wxWindow
+class wxDialog: public wxPanel
 {
   DECLARE_DYNAMIC_CLASS(wxDialog)
 
@@ -71,16 +68,16 @@ class wxDialog: public wxWindow
 /*
     void OnCharHook(wxKeyEvent& event);
 */
+    virtual void SetSize( int x, int y, int width, int height,
+      int sizeFlags = wxSIZE_AUTO );
     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 SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
-    
     virtual void SetIcon( const wxIcon &icon );
     virtual void Iconize( bool WXUNUSED(iconize)) { }
     virtual bool IsIconized(void) const { return FALSE; }
@@ -88,18 +85,12 @@ class wxDialog: public wxWindow
     virtual void Maximize(void) { }
     virtual void Restore(void) { }
     
-  private:
+  // implementation
   
-    friend    wxWindow;
-    friend    wxDC;
-    friend    wxRadioBox;
-    
     bool       m_modalShowing;
     wxString   m_title;
     wxIcon     m_icon;
     
-    virtual void ImplementSetPosition();
-  
   DECLARE_EVENT_TABLE()
     
 };