Warning fixes.

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index a3123e63472b04709cc6ca5b4305b25b05e2446b..2a3f669fe96155038908a60dcfdd335c267b95ec 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -81,9 +81,9 @@ bool wxComboBox::OS2Command(
     }
     //
     // There is no return value for the CBN_ notifications, so always return
     }
     //
     // 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(
 } // end of wxComboBox::OS2Command
 
 bool wxComboBox::Create(


@@ -117,7 +117,7 @@ bool wxComboBox::Create(
 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

-    m_isShown = FALSE;
+    m_isShown = false;

 
     if (!CreateControl( pParent
                        ,vId
 
     if (!CreateControl( pParent
                        ,vId


@@ -127,7 +127,7 @@ bool wxComboBox::Create(
                        ,rValidator
                        ,rsName
                       ))
                        ,rValidator
                        ,rsName
                       ))

-        return FALSE;
+        return false;

 
     //
     // Get the right style
 
     //
     // Get the right style


@@ -150,7 +150,7 @@ bool wxComboBox::Create(
     if (!OS2CreateControl( "COMBOBOX"
                           ,lSstyle
                          ))
     if (!OS2CreateControl( "COMBOBOX"
                           ,lSstyle
                          ))

-        return FALSE;
+        return false;

 
     //
     // A choice/combobox normally has a white background (or other, depending
 
     //
     // A choice/combobox normally has a white background (or other, depending


@@ -171,7 +171,7 @@ bool wxComboBox::Create(
             ,rSize.x
             ,rSize.y
            );
             ,rSize.x
             ,rSize.y
            );

-    if (!rsValue.IsEmpty())
+    if (!rsValue.empty())

     {
         SetValue(rsValue);
     }
     {
         SetValue(rsValue);
     }


@@ -179,8 +179,8 @@ bool wxComboBox::Create(
                                                     ,(PFNWP)wxComboEditWndProc
                                                    );
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);
                                                     ,(PFNWP)wxComboEditWndProc
                                                    );
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);

-    Show(TRUE);
-    return TRUE;
+    Show(true);
+    return true;

 } // end of wxComboBox::Create
 
 void wxComboBox::SetValue(
 } // end of wxComboBox::Create
 
 void wxComboBox::SetValue(


@@ -237,7 +237,7 @@ void wxComboBox::SetInsertionPoint(
 
 void wxComboBox::SetInsertionPointEnd()
 {
 
 void wxComboBox::SetInsertionPointEnd()
 {

-    long                            lPos = GetLastPosition();
+    wxTextPos                       lPos = GetLastPosition();

 
     SetInsertionPoint(lPos);
 } // end of wxComboBox::SetInsertionPointEnd
 
     SetInsertionPoint(lPos);
 } // end of wxComboBox::SetInsertionPointEnd


@@ -254,9 +254,8 @@ long wxComboBox::GetInsertionPoint() const
    return lPos;
 } // end of wxComboBox::GetInsertionPoint
 
    return lPos;
 } // end of wxComboBox::GetInsertionPoint
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
 {

-    HWND                            hEditWnd = GetHwnd();

     long                            lLineLength = 0L;
     WNDPARAMS                       vParams;
 
     long                            lLineLength = 0L;
     WNDPARAMS                       vParams;
 


@@ -288,8 +287,6 @@ void wxComboBox::Replace(
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();

-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;

 
     //
     // Set selection and remove it
 
     //
     // Set selection and remove it


@@ -320,8 +317,6 @@ void wxComboBox::Remove(
 {
 #if wxUSE_CLIPBOARD
     HWND                            hWnd = GetHwnd();
 {
 #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);
 
     ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0);
     ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);


@@ -334,12 +329,12 @@ void wxComboBox::SetSelection(
 )
 {
     HWND                            hWnd = GetHwnd();
 )
 {
     HWND                            hWnd = GetHwnd();

-    long                            lFromChar = lFrom;
-    long                            lToChar = lTo;
+    long                            lFromChar = 0;
+    long                            lToChar   = 0;

 
     //
     // If from and to are both -1, it means
 
     //
     // 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))
     // This translates into Windows convention
     //
     if ((lFrom == -1L) && (lTo == -1L))


@@ -386,7 +381,7 @@ bool wxComboBox::ProcessEditMsg(
                 case KC_CHAR:
                     return (HandleChar( wParam
                                        ,lParam
                 case KC_CHAR:
                     return (HandleChar( wParam
                                        ,lParam

-                                       ,TRUE /* isASCII */
+                                       ,true /* isASCII */

                                       ));
 
                 case KC_PREVDOWN:
                                       ));
 
                 case KC_PREVDOWN:


@@ -408,7 +403,7 @@ bool wxComboBox::ProcessEditMsg(
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
             break;
     }
                 return(HandleKillFocus((WXHWND)(HWND)wParam));
             break;
     }

-    return FALSE;
+    return false;

 } // end of WinGuiBase_CComboBox::ProcessEditMsg
 
 MRESULT EXPENTRY wxComboEditWndProc(
 } // end of WinGuiBase_CComboBox::ProcessEditMsg
 
 MRESULT EXPENTRY wxComboEditWndProc(


@@ -418,11 +413,6 @@ MRESULT EXPENTRY wxComboEditWndProc(
 , MPARAM                            lParam
 )
 {
 , MPARAM                            lParam
 )
 {

-    HWND                            hWndCombo;
-    wxWindow*                       pWin = NULL;
-
-    hWndCombo = ::WinQueryWindow(hWnd, QW_PARENT);
-    pWin = (wxWindow*)wxFindWinFromHandle((WXHWND)hWndCombo);

     switch (uMessage)
     {
         //
     switch (uMessage)
     {
         //


@@ -431,9 +421,9 @@ MRESULT EXPENTRY wxComboEditWndProc(
         case WM_SETFOCUS:
         case WM_CHAR:
             {
         case WM_SETFOCUS:
         case WM_CHAR:
             {

-                wxComboBox*         pCombo = wxDynamicCast( pWin
-                                                           ,wxComboBox
-                                                          );
+                wxComboBox* pCombo = (wxComboBox *)::WinQueryWindowULong( hWnd
+                                                                         ,QWL_USER
+                                                                        );

 
                 if (pCombo->ProcessEditMsg( uMessage
                                            ,wParam
 
                 if (pCombo->ProcessEditMsg( uMessage
                                            ,wParam