implemented wxGetSingleChoiceIndex version that takes wxArrayString

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 7448ef7e50fd9f7b5101c85cb0e5eddc38b99579..84758c1bb8efe5a8f39ddeb4bf8edb2584edd5d4 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -20,9 +20,7 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

-#endif

 
 bool wxChoice::Create(wxWindow *parent,
                       wxWindowID id,
 
 bool wxChoice::Create(wxWindow *parent,
                       wxWindowID id,


@@ -30,7 +28,9 @@ bool wxChoice::Create(wxWindow *parent,
                       const wxSize& size,
                       int n, const wxString choices[],
                       long style,
                       const wxSize& size,
                       int n, const wxString choices[],
                       long style,

+#if wxUSE_VALIDATORS

                       const wxValidator& validator,
                       const wxValidator& validator,

+#endif

                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )


@@ -190,13 +190,12 @@ void* wxChoice::DoGetItemClientData( int n ) const
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 {
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 {

-    DoSetClientData(n, clientData);
+    DoSetItemClientData(n, clientData);

 }
 
 wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 {
 }
 
 wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 {

-    // TODO:    return (wxClientData *)DoGetClientData(n);
-    return NULL;
+    return (wxClientData *)DoGetItemClientData(n);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -215,7 +214,7 @@ void wxChoice::DoSetSize(int x, int y,
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 

-wxSize wxChoice::DoGetBestSize()
+wxSize wxChoice::DoGetBestSize() const

 {
     // find the widest string
     int wLine;
 {
     // find the widest string
     int wLine;


@@ -236,7 +235,7 @@ wxSize wxChoice::DoGetBestSize()
 
     // the combobox should be larger than the widest string
     int cx, cy;
 
     // the combobox should be larger than the widest string
     int cx, cy;

-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont());

 
     wChoice += 5*cx;
 
 
     wChoice += 5*cx;
 


@@ -247,7 +246,7 @@ wxSize wxChoice::DoGetBestSize()
     return wxSize(wChoice, hChoice);
 }
 
     return wxSize(wChoice, hChoice);
 }
 

-MRESULT wxChoice::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+MRESULT wxChoice::OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
    // TODO:
    /*
 {
    // TODO:
    /*


@@ -265,7 +264,7 @@ MRESULT wxChoice::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARA
             return 0;
     }
     */
             return 0;
     }
     */

-    return wxWindow::OS2WindowProc(hwnd, nMsg, wParam, lParam);
+    return wxWindow::OS2WindowProc(nMsg, wParam, lParam);

 }
 
 bool wxChoice::OS2Command(WXUINT param, WXWORD WXUNUSED(id))
 }
 
 bool wxChoice::OS2Command(WXUINT param, WXWORD WXUNUSED(id))