applied (slightly modified) wxGLApp patch for MSW

[wxWidgets.git] / src / os2 / radiobox.cpp

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 6048148d4acc4be20e84e81214cfba4049b09c2f..cf31c122fb7b75f2710484b9e79c709291e23866 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -15,6 +15,8 @@
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/setup.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/setup.h"

+    #include "wx/wxchar.h"
+    #include "wx/string.h"

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


@@ -22,9 +24,7 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

-#endif

 
 // ---------------------------------------------------------------------------
 // private functions
 
 // ---------------------------------------------------------------------------
 // private functions


@@ -51,6 +51,21 @@ static s_wndprocRadioBtn = NULL;
 // wxRadioBox
 // ---------------------------------------------------------------------------
 
 // wxRadioBox
 // ---------------------------------------------------------------------------
 

+int wxRadioBox::GetCount() const
+{
+    return m_noItems;
+}
+
+int wxRadioBox::GetColumnCount() const
+{
+    return GetNumHor();
+}
+
+int wxRadioBox::GetRowCount() const
+{
+    return GetNumVer();
+}
+

 int wxRadioBox::GetNumVer() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
 int wxRadioBox::GetNumVer() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )


@@ -143,14 +158,17 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
         const wxPoint& pos, const wxSize& size,
         int n, const wxString choices[],
         int majorDim, long style,
         const wxPoint& pos, const wxSize& size,
         int n, const wxString choices[],
         int majorDim, long style,

+#if wxUSE_VALIDATORS

         const wxValidator& val, const wxString& name)
         const wxValidator& val, const wxString& name)

+#endif

 {
     m_selectedButton = -1;
     m_noItems = n;
 
     SetName(name);
 {
     m_selectedButton = -1;
     m_noItems = n;
 
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(val);
     SetValidator(val);

-
+#endif

     parent->AddChild(this);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     parent->AddChild(this);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();


@@ -278,6 +296,14 @@ wxRadioBox::~wxRadioBox()
 
 }
 
 
 }
 

+void wxRadioBox::SetString(int item, const wxString& label)
+{
+    wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );
+
+    m_radioWidth[item] = m_radioHeight[item] = -1;
+    ::WinSetWindowText((HWND)m_radioButtons[item], label.c_str());
+}
+

 wxString wxRadioBox::GetLabel(int item) const
 {
     wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") );
 wxString wxRadioBox::GetLabel(int item) const
 {
     wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") );