typo fixes

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 1fd96160e517223c94162a30b2b9389e51e06bf2..927325f75848a6a21c64de43e2064c8f35a9f5e1 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -102,7 +102,7 @@ bool wxComboBox::Create(
 )
 {
 
 )
 {
 

-    if (!OS2CreateControl( pParent
+    if (!CreateControl( pParent

                        ,vId
                        ,rPos
                        ,rSize
                        ,vId
                        ,rPos
                        ,rSize


@@ -143,10 +143,14 @@ bool wxComboBox::Create(
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 

-    SetFont(pParent->GetFont());
+    wxFont*                          pTextFont = new wxFont( 10
+                                                            ,wxMODERN
+                                                            ,wxNORMAL
+                                                            ,wxNORMAL
+                                                           );
+    SetFont(*pTextFont);

 
     int                             i;
 
     int                             i;

-

     for (i = 0; i < n; i++)
     {
         Append(asChoices[i]);
     for (i = 0; i < n; i++)
     {
         Append(asChoices[i]);


@@ -165,6 +169,7 @@ bool wxComboBox::Create(
                                                     ,(PFNWP)wxComboEditWndProc
                                                    );
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);
                                                     ,(PFNWP)wxComboEditWndProc
                                                    );
     ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);

+    delete pTextFont;

     return TRUE;
 } // end of wxComboBox::Create
 
     return TRUE;
 } // end of wxComboBox::Create
 


@@ -398,22 +403,29 @@ bool wxComboBox::ProcessEditMsg(
             switch(vFlag)
             {
                 case KC_CHAR:
             switch(vFlag)
             {
                 case KC_CHAR:

-                    return (HandleChar( SHORT1FROMMP(wParam)
+                    return (HandleChar( wParam

                                        ,lParam
                                        ,TRUE /* isASCII */
                                       ));
 
                 case KC_PREVDOWN:
                                        ,lParam
                                        ,TRUE /* isASCII */
                                       ));
 
                 case KC_PREVDOWN:

-                    return (HandleKeyDown( SHORT1FROMMP(wParam)
+                    return (HandleKeyDown( wParam

                                           ,lParam
                                          ));
 
                 case KC_KEYUP:
                                           ,lParam
                                          ));
 
                 case KC_KEYUP:

-                    return (HandleKeyUp( SHORT1FROMMP(wParam)
+                    return (HandleKeyUp( wParam

                                         ,lParam
                                        ));
             }
             break;
                                         ,lParam
                                        ));
             }
             break;

+
+        case WM_SETFOCUS:
+            if (SHORT1FROMMP((MPARAM)lParam) == TRUE)
+                return(HandleSetFocus((WXHWND)(HWND)wParam));
+            else
+                return(HandleKillFocus((WXHWND)(HWND)wParam));
+            break;

     }
     return FALSE;
 } // end of WinGuiBase_CComboBox::ProcessEditMsg
     }
     return FALSE;
 } // end of WinGuiBase_CComboBox::ProcessEditMsg


@@ -435,6 +447,7 @@ MRESULT EXPENTRY wxComboEditWndProc(
         //
         // Forward some messages to the combobox
         //
         //
         // Forward some messages to the combobox
         //

+        case WM_SETFOCUS:

         case WM_CHAR:
             {
                 wxComboBox*         pCombo = wxDynamicCast( pWin
         case WM_CHAR:
             {
                 wxComboBox*         pCombo = wxDynamicCast( pWin