Small changes after Robert's edits

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 44f11d3fdf59ea49a8f862e09676df84eecaf3c2..236b8cc02476a18eb0935fffdc446bf176177a55 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -21,6 +21,7 @@
 #include "wx/string.h"
 #include "wx/event.h"
 #include "wx/window.h"
 #include "wx/string.h"
 #include "wx/event.h"
 #include "wx/window.h"

+#include "wx/icon.h"

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


@@ -63,8 +64,9 @@ 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);
     void OnPaint(wxPaintEvent& event);

+    bool Destroy(void);

     void OnCloseWindow(wxCloseEvent& event);
 /*
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 /*
     void OnCharHook(wxKeyEvent& event);


@@ -73,21 +75,31 @@ class wxDialog: public wxWindow
     virtual int ShowModal(void);
     virtual void EndModal(int retCode);
     virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
     virtual int ShowModal(void);
     virtual void EndModal(int retCode);
     virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }

+    void SetModal( bool modal );

     virtual void InitDialog(void);
     virtual void InitDialog(void);

-/*
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-*/
+    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; }
+    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()
     
 };