[ 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 5017194242e359faf237370f172e3e1956ad46cb..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,9 +81,9 @@ 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(
@@ -117,7 +117,7 @@ bool wxComboBox::Create(
 , const wxString&                   rsName
 )
 {
-    m_isShown = FALSE;
+    m_isShown = false;
 
     if (!CreateControl( pParent
                        ,vId
@@ -127,7 +127,7 @@ bool wxComboBox::Create(
                        ,rValidator
                        ,rsName
                       ))
-        return FALSE;
+        return false;
 
     //
     // Get the right style
@@ -147,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
@@ -171,7 +171,7 @@ bool wxComboBox::Create(
             ,rSize.x
             ,rSize.y
            );
-    if (!rsValue.IsEmpty())
+    if (!rsValue.empty())
     {
         SetValue(rsValue);
     }
@@ -179,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(
@@ -190,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
 
 //
@@ -237,7 +237,7 @@ void wxComboBox::SetInsertionPoint(
 
 void wxComboBox::SetInsertionPointEnd()
 {
-    long                            lPos = GetLastPosition();
+    wxTextPos                       lPos = GetLastPosition();
 
     SetInsertionPoint(lPos);
 } // end of wxComboBox::SetInsertionPointEnd
@@ -254,7 +254,7 @@ long wxComboBox::GetInsertionPoint() const
    return lPos;
 } // end of wxComboBox::GetInsertionPoint
 
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
 {
     long                            lLineLength = 0L;
     WNDPARAMS                       vParams;
@@ -334,7 +334,7 @@ void wxComboBox::SetSelection(
 
     //
     // 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))
@@ -381,7 +381,7 @@ bool wxComboBox::ProcessEditMsg(
                 case KC_CHAR:
                     return (HandleChar( wParam
                                        ,lParam
-                                       ,TRUE /* isASCII */
+                                       ,true /* isASCII */
                                       ));
 
                 case KC_PREVDOWN:
@@ -403,7 +403,7 @@ bool wxComboBox::ProcessEditMsg(
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
             break;
     }
-    return FALSE;
+    return false;
 } // end of WinGuiBase_CComboBox::ProcessEditMsg
 
 MRESULT EXPENTRY wxComboEditWndProc(