GetHandle() added (back)

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 3ba68d40d989822e4429c7dc7b378e7e4c03f20c..2c2e72ec8b0c3c2a8d88f5d416a709c8e141587f 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -2,10 +2,9 @@
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -49,18 +48,19 @@ 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,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             int majorDim = 1, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, 
-            const wxString& name = wxRadioBoxNameStr )
+             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,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, 
-            const wxString& name = wxRadioBoxNameStr );
+             const wxString& name = wxRadioBoxNameStr );
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection(void) const;
@@ -70,7 +70,7 @@ class wxRadioBox: public wxControl
     void SetLabel( int item, wxBitmap *bitmap );
     wxString GetLabel( int item ) const;
     bool Show( bool show );
-    void Enable( bool enable );
+    bool Enable( bool enable );
     void Enable( int item, bool enable );
     void Show( int item, bool show );
     virtual wxString GetStringSelection(void) const;
@@ -79,19 +79,20 @@ class wxRadioBox: public wxControl
     int GetNumberOfRowsOrCols(void) const;
     void SetNumberOfRowsOrCols( int n );
     
-    void SetFont( const wxFont &font );
     void OnSize( wxSizeEvent &event );
+    void SetFocus();
     
   // 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()    
-    
 };
 
 #endif // __GTKRADIOBOXH__