[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 90a8241fae21a63ca96348322652e631966e976a..6f342c5506a4c2f843bfeff1a1059ce15161c51e 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -58,7 +58,7 @@ bool wxComboBox::OS2Command(
 
                 vEvent.SetInt(GetSelection());
                 vEvent.SetEventObject(this);
-                vEvent.SetString((char*)GetStringSelection().c_str());
+                vEvent.SetString(GetStringSelection());
                 ProcessCommand(vEvent);
             }
             break;
@@ -73,7 +73,7 @@ bool wxComboBox::OS2Command(
                     sValue = GetValue();
                 else
                     SetValue(sValue);
-                vEvent.SetString((char*)GetValue().c_str());
+                vEvent.SetString(GetValue());
                 vEvent.SetEventObject(this);
                 ProcessCommand(vEvent);
             }
@@ -81,11 +81,29 @@ bool wxComboBox::OS2Command(
     }
     //
     // There is no return value for the CBN_ notifications, so always return
-    // FALSE from here to pass the message to DefWindowProc()
+    // false from here to pass the message to DefWindowProc()
     //
-    return FALSE;
+    return false;
 } // end of wxComboBox::OS2Command
 
+bool wxComboBox::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxString&                   rsValue
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, const wxArrayString&              asChoices
+, long                              lStyle
+, const wxValidator&                rValidator
+, const wxString&                   rsName
+)
+{
+    wxCArrayString chs(asChoices);
+
+    return Create(pParent, vId, rsValue, rPos, rSize, chs.GetCount(),
+                  chs.GetStrings(), lStyle, rValidator, rsName);
+}
+
 bool wxComboBox::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
@@ -99,7 +117,7 @@ bool wxComboBox::Create(
 , const wxString&                   rsName
 )
 {
-    m_isShown = FALSE;
+    m_isShown = false;
 
     if (!CreateControl( pParent
                        ,vId
@@ -109,7 +127,7 @@ bool wxComboBox::Create(
                        ,rValidator
                        ,rsName
                       ))
-        return FALSE;
+        return false;
 
     //
     // Get the right style
@@ -129,10 +147,10 @@ bool wxComboBox::Create(
         lSstyle |= CBS_DROPDOWN;
 
 
-    if (!OS2CreateControl( "COMBOBOX"
+    if (!OS2CreateControl( _T("COMBOBOX")
                           ,lSstyle
                          ))
-        return FALSE;
+        return false;
 
     //
     // A choice/combobox normally has a white background (or other, depending
@@ -153,7 +171,7 @@ bool wxComboBox::Create(
             ,rSize.x
             ,rSize.y
            );
-    if (!rsValue.IsEmpty())
+    if (!rsValue.empty())
     {
         SetValue(rsValue);
     }
@@ -161,8 +179,8 @@ bool wxComboBox::Create(
                                                     ,(PFNWP)wxComboEditWndProc
                                                    );
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);
-    Show(TRUE);
-    return TRUE;
+    Show(true);
+    return true;
 } // end of wxComboBox::Create
 
 void wxComboBox::SetValue(
@@ -172,7 +190,7 @@ void wxComboBox::SetValue(
     if ( HasFlag(wxCB_READONLY) )
         SetStringSelection(rsValue);
     else
-        ::WinSetWindowText(GetHwnd(), rsValue.c_str());
+        ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());
 } // end of wxComboBox::SetValue
 
 //
@@ -219,7 +237,7 @@ void wxComboBox::SetInsertionPoint(
 
 void wxComboBox::SetInsertionPointEnd()
 {
-    long                            lPos = GetLastPosition();
+    wxTextPos                       lPos = GetLastPosition();
 
     SetInsertionPoint(lPos);
 } // end of wxComboBox::SetInsertionPointEnd
@@ -236,9 +254,8 @@ long wxComboBox::GetInsertionPoint() const
    return lPos;
 } // end of wxComboBox::GetInsertionPoint
 
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
 {
-    HWND                            hEditWnd = GetHwnd();
     long                            lLineLength = 0L;
     WNDPARAMS                       vParams;
 
@@ -270,8 +287,6 @@ void wxComboBox::Replace(
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;
 
     //
     // Set selection and remove it
@@ -302,8 +317,6 @@ void wxComboBox::Remove(
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;
 
     ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0);
     ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);
@@ -316,12 +329,12 @@ void wxComboBox::SetSelection(
 )
 {
     HWND                            hWnd = GetHwnd();
-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;
+    long                            lFromChar = 0;
+    long                            lToChar   = 0;
 
     //
     // If from and to are both -1, it means
-    // (in wxWindows) that all text should be selected.
+    // (in wxWidgets) that all text should be selected.
     // This translates into Windows convention
     //
     if ((lFrom == -1L) && (lTo == -1L))
@@ -368,7 +381,7 @@ bool wxComboBox::ProcessEditMsg(
                 case KC_CHAR:
                     return (HandleChar( wParam
                                        ,lParam
-                                       ,TRUE /* isASCII */
+                                       ,true /* isASCII */
                                       ));
 
                 case KC_PREVDOWN:
@@ -390,7 +403,7 @@ bool wxComboBox::ProcessEditMsg(
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
             break;
     }
-    return FALSE;
+    return false;
 } // end of WinGuiBase_CComboBox::ProcessEditMsg
 
 MRESULT EXPENTRY wxComboEditWndProc(
@@ -400,11 +413,6 @@ MRESULT EXPENTRY wxComboEditWndProc(
 , MPARAM                            lParam
 )
 {
-    HWND                            hWndCombo;
-    wxWindow*                       pWin = NULL;
-
-    hWndCombo = ::WinQueryWindow(hWnd, QW_PARENT);
-    pWin = (wxWindow*)wxFindWinFromHandle((WXHWND)hWndCombo);
     switch (uMessage)
     {
         //
@@ -413,9 +421,9 @@ MRESULT EXPENTRY wxComboEditWndProc(
         case WM_SETFOCUS:
         case WM_CHAR:
             {
-                wxComboBox*         pCombo = wxDynamicCast( pWin
-                                                           ,wxComboBox
-                                                          );
+                wxComboBox* pCombo = (wxComboBox *)::WinQueryWindowULong( hWnd
+                                                                         ,QWL_USER
+                                                                        );
 
                 if (pCombo->ProcessEditMsg( uMessage
                                            ,wParam