Added wxPoem sample; fixed some Dialog Editor problems; wxStaticBitmap and wxBitmapButton

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 6c9c99e2a1b363a6c819dcaeaa9679b2a5ee511a..25cfa99c37751f0ca1affd972d66ec0574352129 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -2,13 +2,12 @@
 // Name:        dialog.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Created:
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
@@ -17,16 +16,8 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/event.h"
-#include "wx/window.h"
-
-//-----------------------------------------------------------------------------
-// forward decls
-//-----------------------------------------------------------------------------
-
-class wxRadioBox;
+#include "wx/panel.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -44,52 +35,72 @@ extern const char *wxDialogNameStr;
 // wxDialog
 //-----------------------------------------------------------------------------
 
-class wxDialog: public wxWindow
+class wxDialog: public wxPanel
 {
   DECLARE_DYNAMIC_CLASS(wxDialog)
 
-  public:
-
-    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 );
-    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 );
-    ~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 OnPaint(wxPaintEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-/*
-    void OnCharHook(wxKeyEvent& event);
-*/
-    virtual bool Show( const bool show );
-    virtual int ShowModal(void);
-    virtual void EndModal(int retCode);
-    virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
-    virtual void InitDialog(void);
+public:
+  wxDialog();
+  wxDialog( wxWindow *parent, wxWindowID id, 
+            const wxString &title,
+            const wxPoint &pos = wxDefaultPosition, 
+           const wxSize &size = wxDefaultSize, 
+            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, 
+               long style = wxDEFAULT_DIALOG_STYLE, 
+              const wxString &name = wxDialogNameStr );
+  ~wxDialog();
+  
+  void SetTitle(const wxString& title);
+  wxString GetTitle() const;
+  
+  bool OnClose();
+  void OnApply( wxCommandEvent &event );
+  void OnCancel( wxCommandEvent &event );
+  void OnOK( wxCommandEvent &event );
+  void OnPaint( wxPaintEvent& event );
+  void OnSize( wxSizeEvent &event );
 /*
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
+  void OnCharHook( wxKeyEvent& event );
 */
+  
+  bool Destroy();
+  void OnCloseWindow( wxCloseEvent& event );
+  
+  virtual void SetSize( int x, int y, int width, int height,
+      int sizeFlags = wxSIZE_AUTO );
+  virtual void SetSize( int width, int height );
+      
+  virtual bool Show( bool show );
+  virtual int ShowModal();
+  virtual void EndModal( int retCode );
+  virtual bool IsModal() const;
+  void SetModal( bool modal );
+  
+  virtual void InitDialog(void);
     
-  private:
+  virtual void Centre( int direction = wxHORIZONTAL );
+    
+  virtual void SetIcon( const wxIcon &icon );
+  virtual void Iconize( bool WXUNUSED(iconize)) { }
+  virtual bool IsIconized() const { return FALSE; }
+  bool Iconized() const { return IsIconized(); }
+  virtual void Maximize() { }
+  virtual void Restore() { }
+    
+// implementation
   
-    friend    wxWindow;
-    friend    wxDC;
-    friend    wxRadioBox;
-    bool       m_modalShowing;
-    wxString   m_title;
+  virtual void GtkOnSize( int x, int y, int width, int height );
+  
+  bool       m_modalShowing;
+  wxString   m_title;
+  wxIcon     m_icon;
     
   DECLARE_EVENT_TABLE()
-    
 };
 
 #endif // __GTKDIALOGH__