Fixes, typos etc...

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 6c9c99e2a1b363a6c819dcaeaa9679b2a5ee511a..624b4f06ed8ec4a512657b45671d2844e68802ad 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -17,10 +17,8 @@
 #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
@@ -44,7 +42,7 @@ extern const char *wxDialogNameStr;
 // wxDialog
 //-----------------------------------------------------------------------------
 
-class wxDialog: public wxWindow
+class wxDialog: public wxPanel
 {
   DECLARE_DYNAMIC_CLASS(wxDialog)
 
@@ -53,41 +51,50 @@ class wxDialog: public wxWindow
     wxDialog(void);
     wxDialog( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
+      long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
     bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
+      long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
     ~wxDialog(void);
     void SetTitle(const wxString& title);
     wxString GetTitle(void) const;
     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 OnCharHook(wxKeyEvent& event);
 */
-    virtual bool Show( const bool show );
+    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);
-/*
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-*/
+    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;
+    
     bool       m_modalShowing;
     wxString   m_title;
+    wxIcon     m_icon;
     
+    virtual void ImplementSetPosition();
+  
   DECLARE_EVENT_TABLE()
     
 };