Committing in .

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 0393f574e0d24b417f3bb335628ecb285dad6621..a1cdd262b1e2ed85a35cf333337d6995a404a235 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -39,16 +39,16 @@ bool wxChoice::Create(
 {
     long                            lSstyle;
 
 {
     long                            lSstyle;
 

-    if (!OS2CreateControl( pParent
-                          ,vId
-                          ,rPos
-                          ,rSize
-                          ,lStyle
+    if (!CreateControl( pParent
+                       ,vId
+                       ,rPos
+                       ,rSize
+                       ,lStyle

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-                          ,rValidator
+                       ,rValidator

 #endif
 #endif

-                          ,rsName
-                         ))
+                       ,rsName
+                      ))

         return FALSE;
     lSstyle = CBS_DROPDOWNLIST |
               WS_TABSTOP       |
         return FALSE;
     lSstyle = CBS_DROPDOWNLIST |
               WS_TABSTOP       |


@@ -190,18 +190,17 @@ void wxChoice::SetString(
 {
     SHORT                           nIndexType = 0;
 
 {
     SHORT                           nIndexType = 0;
 

-    ::WinSendMsg(WinUtil_GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0);
-
+    ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0);

 
 

-    if (m_lWindowStyle & winLB_SORT)
+    if (m_windowStyle & wxLB_SORT)

         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = LIT_END;
         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = LIT_END;

-    lIndex = (YInt32)::WinSendMsg( WinUtil_GetHwnd()
-                                  ,LM_INSERTITEM
-                                  ,(MPARAM)nIndexType
-                                  ,(MPARAM)rsStr.Data()
-                                 );
+    ::WinSendMsg( GetHwnd()
+                 ,LM_INSERTITEM
+                 ,(MPARAM)nIndexType
+                 ,(MPARAM)rsStr.c_str()
+                );

 } // end of wxChoice::SetString
 
 wxString wxChoice::GetString(
 } // end of wxChoice::SetString
 
 wxString wxChoice::GetString(