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 9e48ac41d8eb072e00ce10bb6907acf95ff9abc5..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,19 +24,17 @@
 
 #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
 // ---------------------------------------------------------------------------
 
 // wnd proc for radio buttons
 
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 
 // wnd proc for radio buttons

-MRESULT _EXPORT wxRadioBtnWndProc(HWND hWnd,
-                                  UINT message,
-                                  MPARAM wParam,
-                                  MPARAM lParam);
+MRESULT wxRadioBtnWndProc(HWND hWnd,
+                          UINT message,
+                          MPARAM wParam,
+                          MPARAM lParam);

 
 // ---------------------------------------------------------------------------
 // global vars
 
 // ---------------------------------------------------------------------------
 // global vars


@@ -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();


@@ -173,7 +191,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
         m_majorDim = majorDim;
     m_noRowsOrCols = majorDim;
 
         m_majorDim = majorDim;
     m_noRowsOrCols = majorDim;
 

-    long msStyle = GROUP_FLAGS;
+    long msStyle = 0; // TODO: GROUP_FLAGS;

 
     bool want3D;
     WXDWORD exStyle = Determine3DEffects(0, &want3D);
 
     bool want3D;
     WXDWORD exStyle = Determine3DEffects(0, &want3D);


@@ -245,9 +263,9 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     }
 
     // Create a dummy radio control to end the group.
     }
 
     // Create a dummy radio control to end the group.

-    (void)CreateWindowEx(0, RADIO_CLASS, wxT(""), WS_GROUP | RADIO_FLAGS,
-                         0, 0, 0, 0, hwndParent,
-                         (HMENU)NewControlId(), wxGetInstance(), NULL);
+//    (void)CreateWindowEx(0, RADIO_CLASS, wxT(""), WS_GROUP | RADIO_FLAGS,
+//                         0, 0, 0, 0, hwndParent,
+//                         (HMENU)NewControlId(), wxGetInstance(), NULL);

 
     SetSelection(0);
 
 
     SetSelection(0);
 


@@ -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") );


@@ -427,11 +453,11 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         {
             if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
                 height = totHeight + extraHeight;
         {
             if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
                 height = totHeight + extraHeight;

-            else 
+            else

                 height = heightOld;
         }
 
                 height = heightOld;
         }
 

-        MoveWindow(GetHwnd(), x_offset, y_offset, width, height, TRUE);
+// TODO:  MoveWindow(GetHwnd(), x_offset, y_offset, width, height, TRUE);

 
         x_offset += cx1;
         y_offset += cy1;
 
         x_offset += cx1;
         y_offset += cy1;


@@ -497,7 +523,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 void wxRadioBox::GetSize(int *width, int *height) const
 {
     RECT rect;
 void wxRadioBox::GetSize(int *width, int *height) const
 {
     RECT rect;

-    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+    rect.xLeft = -1; rect.xRight = -1; rect.yTop = -1; rect.yBottom = -1;

 
     if (m_hWnd)
         wxFindMaxSize(m_hWnd, &rect);
 
     if (m_hWnd)
         wxFindMaxSize(m_hWnd, &rect);


@@ -506,15 +532,15 @@ void wxRadioBox::GetSize(int *width, int *height) const
     for (i = 0; i < m_noItems; i++)
         wxFindMaxSize(m_radioButtons[i], &rect);
 
     for (i = 0; i < m_noItems; i++)
         wxFindMaxSize(m_radioButtons[i], &rect);
 

-    *width = rect.right - rect.left;
-    *height = rect.bottom - rect.top;
+    *width = rect.xRight - rect.xLeft;
+    *height = rect.yBottom - rect.yTop;

 }
 
 void wxRadioBox::GetPosition(int *x, int *y) const
 {
     wxWindow *parent = GetParent();
     RECT rect;
 }
 
 void wxRadioBox::GetPosition(int *x, int *y) const
 {
     wxWindow *parent = GetParent();
     RECT rect;

-    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+    rect.xLeft = -1; rect.xRight = -1; rect.yTop = -1; rect.yBottom = -1;

 
     int i;
     for (i = 0; i < m_noItems; i++)
 
     int i;
     for (i = 0; i < m_noItems; i++)


@@ -525,9 +551,9 @@ void wxRadioBox::GetPosition(int *x, int *y) const
 
     // Since we now have the absolute screen coords,
     // if there's a parent we must subtract its top left corner
 
     // Since we now have the absolute screen coords,
     // if there's a parent we must subtract its top left corner

-    POINT point;
-    point.x = rect.left;
-    point.y = rect.top;
+    POINTL point;
+    point.x = rect.xLeft;
+    point.y = rect.yTop;

 // TODO:
 /*
     if (parent)
 // TODO:
 /*
     if (parent)


@@ -568,7 +594,7 @@ bool wxRadioBox::Show(bool show)
     if ( !wxControl::Show(show) )
         return FALSE;
 
     if ( !wxControl::Show(show) )
         return FALSE;
 

-    int nCmdShow = show ? SW_SHOW : SW_HIDE;
+    int nCmdShow = 0; // TODO: show ? SW_SHOW : SW_HIDE;

     for ( int i = 0; i < m_noItems; i++ )
     {
 // TODO:        ::ShowWindow((HWND)m_radioButtons[i], nCmdShow);
     for ( int i = 0; i < m_noItems; i++ )
     {
 // TODO:        ::ShowWindow((HWND)m_radioButtons[i], nCmdShow);


@@ -696,18 +722,18 @@ void wxRadioBox::SendNotificationEvent()
 // window proc for radio buttons
 // ---------------------------------------------------------------------------
 
 // window proc for radio buttons
 // ---------------------------------------------------------------------------
 

-MRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
-                                           UINT msg,
-                                           MPARAM wParam,
-                                           MPARAM lParam)
+MRESULT wxRadioBtnWndProc(HWND hwnd,
+                          UINT msg,
+                          MPARAM wParam,
+                          MPARAM lParam)

 {
     bool processed = TRUE;
 {
     bool processed = TRUE;

-    if ( msg != WM_KEYDOWN )
-        processed = FALSE;        
+//    if ( msg != WM_KEYDOWN )
+//        processed = FALSE;

 
     if ( processed )
     {
 
     if ( processed )
     {

-        wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA);
+        wxRadioBox *radiobox = NULL; // TODO: (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA);

 
         wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 
 
         wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 


@@ -746,7 +772,7 @@ MRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
                 // fall through
 
             default:
                 // fall through
 
             default:

-                processed = FALSE;        
+                processed = FALSE;

         }
 */
         if ( processed )
         }
 */
         if ( processed )