Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index eded3b86e93eea564e10e8f25ae876107a2421c5..16af2a266897c550427181753a5ebfb06461943d 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -15,27 +15,8 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_RADIOBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"

 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxRadioBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxRadioBoxNameStr;
-

 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------


@@ -43,24 +24,37 @@ extern const char *wxRadioBoxNameStr;
 class wxRadioBox: public wxControl
 {
 public:
 class wxRadioBox: public wxControl
 {
 public:

-    wxRadioBox();
-    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 = 1, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, 
-             const wxString& name = wxRadioBoxNameStr )
+    wxRadioBox() { Init(); }
+    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 = 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 );
+        Init();
+
+        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 );
-            
+
+    ~wxRadioBox();
+    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);
+

     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;


@@ -84,7 +78,8 @@ public:
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
     
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
     

-    virtual int Number() const;
+    int Number() const;
+    int GetCount() const { return Number(); }

     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
     
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
     


@@ -100,16 +95,22 @@ public:
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
     wxSize LayoutItems();
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
     wxSize LayoutItems();

-    void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
+
+    virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
+    virtual void OnInternalIdle();

     
     bool             m_alreadySent;
     
     bool             m_alreadySent;

+    bool             m_hasFocus,
+                     m_lostFocus;

     int              m_majorDim;
     wxList           m_boxes;
     int              m_majorDim;
     wxList           m_boxes;

-    
+
+protected:
+    // common part of all ctors
+    void Init();
+

 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 

-#endif
-

 #endif // __GTKRADIOBOXH__
 #endif // __GTKRADIOBOXH__