Reference counted objects should be used *much* more carefully. This was

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 1da4e3d97997fec74b0645273aa9bf10bf64ac56..befbee24d6e57a67e53e1d89374acbd4c1b3df2c 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -2,9 +2,8 @@
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -49,12 +48,13 @@ class wxRadioBox: public wxControl
     inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = (const wxString *) NULL,
     inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = (const wxString *) NULL,

-             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             int majorDim = 1, long style = wxRA_HORIZONTAL,

              const wxValidator& val = wxDefaultValidator, 
             const wxString& name = wxRadioBoxNameStr )
     {
       Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
              const wxValidator& val = wxDefaultValidator, 
             const wxString& name = wxRadioBoxNameStr )
     {
       Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }

+    ~wxRadioBox(void);

     bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = (const wxString *) NULL,
     bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = (const wxString *) NULL,


@@ -65,7 +65,6 @@ class wxRadioBox: public wxControl
     void SetSelection( int n );
     int GetSelection(void) const;
     wxString GetString( int n ) const;
     void SetSelection( int n );
     int GetSelection(void) const;
     wxString GetString( int n ) const;

-    wxString GetLabel(void) const;

     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );
     void SetLabel( int item, wxBitmap *bitmap );
     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );
     void SetLabel( int item, wxBitmap *bitmap );


@@ -79,20 +78,21 @@ class wxRadioBox: public wxControl
     virtual int Number(void) const;
     int GetNumberOfRowsOrCols(void) const;
     void SetNumberOfRowsOrCols( int n );
     virtual int Number(void) const;
     int GetNumberOfRowsOrCols(void) const;
     void SetNumberOfRowsOrCols( int n );

-    void SetFont( const wxFont &font );
-
+    

     void OnSize( wxSizeEvent &event );
     void OnSize( wxSizeEvent &event );

+    void SetFocus();

     
   // implementation    
     
     
   // implementation    
     

-    bool            m_alreadySent;
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    wxSize LayoutItems();

     
     

-  private:
-  
-    GtkRadioButton *m_radio;
+    bool             m_alreadySent;
+    int              m_majorDim;
+    wxList           m_boxes;

     
   DECLARE_EVENT_TABLE()    
     
   DECLARE_EVENT_TABLE()    

-    

 };
 
 #endif // __GTKRADIOBOXH__
 };
 
 #endif // __GTKRADIOBOXH__