hack to implement right aligned checkboxes

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 2e3607d09c7ab0b6fe0c011f58f84b0690196b1f..62bd45a4cd320f9a233ab85ee72a595b41f5be55 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__


@@ -37,67 +37,75 @@ extern const char *wxDialogNameStr;
 
 class wxDialog: public wxPanel
 {
 
 class wxDialog: public wxPanel
 {

-  DECLARE_DYNAMIC_CLASS(wxDialog)
+    DECLARE_DYNAMIC_CLASS(wxDialog)

 
 public:
 
 public:

-  wxDialog();
-  wxDialog( wxWindow *parent, wxWindowID id, 
+    wxDialog() { Init(); }
+    wxDialog( wxWindow *parent, wxWindowID id,

             const wxString &title,
             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 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);
-    
-  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
-  
-  bool       m_modalShowing;
-  wxString   m_title;
-  wxIcon     m_icon;
-    
-  DECLARE_EVENT_TABLE()
+            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;
+
+    void OnApply( wxCommandEvent &event );
+    void OnCancel( wxCommandEvent &event );
+    void OnOK( wxCommandEvent &event );
+    void OnPaint( wxPaintEvent& event );
+    void OnSize( wxSizeEvent &event );
+    void OnCloseWindow( wxCloseEvent& event );
+    /*
+       void OnCharHook( wxKeyEvent& event );
+     */
+
+    bool Destroy();
+
+    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);
+
+    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
+
+    virtual void GtkOnSize( int x, int y, int width, int height );
+    virtual void OnInternalIdle();
+
+    bool       m_modalShowing;
+    wxString   m_title;
+    wxIcon     m_icon;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKDIALOGH__
 };
 
 #endif // __GTKDIALOGH__