changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index f648659e65b7855d9ee71822576277514d4473ff..09b518b732cbe08deaa293dc4dad92f83c895c9a 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -46,21 +45,26 @@ class wxRadioBox: public wxControl
   public:
   
     wxRadioBox(void);
   public:
   
     wxRadioBox(void);

-    wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      int majorDim = 0, long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
+    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,
+             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,
     bool Create( wxWindow *parent, wxWindowID id, const wxString& title,

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      int majorDim = 0, long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
+             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 );

     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection(void) const;
     wxString GetString( int n ) const;
     int FindString( const wxString& s) 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 );


@@ -74,11 +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 );

-
-  private:
-  
-    GtkRadioButton *m_radio;

     
     

+    void OnSize( wxSizeEvent &event );
+    void SetFocus();
+    
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    wxSize LayoutItems();
+    
+    bool             m_alreadySent;
+    int              m_majorDim;
+    wxList           m_boxes;
+    
+  DECLARE_EVENT_TABLE()    

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