no message

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index db28c7772b6b255fa3ac139d8406126091ce28fb..624b4f06ed8ec4a512657b45671d2844e68802ad 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -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)
 


@@ -63,7 +61,7 @@ class wxDialog: public wxWindow
     bool OnClose(void);
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );
     bool OnClose(void);
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );

-    void OnOk( wxCommandEvent &event );
+    void OnOK( wxCommandEvent &event );

     void OnPaint(wxPaintEvent& event);
     bool Destroy(void);
     void OnCloseWindow(wxCloseEvent& event);
     void OnPaint(wxPaintEvent& event);
     bool Destroy(void);
     void OnCloseWindow(wxCloseEvent& event);


@@ -73,17 +71,30 @@ 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 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;
     friend    wxDC;
     friend    wxRadioBox;
     
   private:
   
     friend    wxWindow;
     friend    wxDC;
     friend    wxRadioBox;

+    

     bool       m_modalShowing;
     wxString   m_title;
     bool       m_modalShowing;
     wxString   m_title;

+    wxIcon     m_icon;

     
     

+    virtual void ImplementSetPosition();
+  

   DECLARE_EVENT_TABLE()
     
 };
   DECLARE_EVENT_TABLE()
     
 };