Committing in .

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index d1861e80f091b3db402d05bb25c094086e7c57e0..038fa35ec555e8a048457bd304effaeda29d0666 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -49,7 +49,7 @@ bool wxComboBox::OS2Command(
 
     switch (uParam)
     {
 
     switch (uParam)
     {

-        case LN_SELECT:
+        case CBN_LBSELECT:

             if (GetSelection() > -1)
             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED
             if (GetSelection() > -1)
             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED


@@ -63,7 +63,7 @@ bool wxComboBox::OS2Command(
             }
             break;
 
             }
             break;
 

-        case EN_CHANGE:
+        case CBN_EFCHANGE:

             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_TEXT_UPDATED
                                            ,GetId()
             {
                 wxCommandEvent      vEvent( wxEVT_COMMAND_TEXT_UPDATED
                                            ,GetId()


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

+    m_isShown = FALSE;

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


@@ -143,12 +144,7 @@ bool wxComboBox::Create(
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 

-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);
+    SetFont(*wxSMALL_FONT);

 
     int                             i;
     for (i = 0; i < n; i++)
 
     int                             i;
     for (i = 0; i < n; i++)


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

-    delete pTextFont;
+    Show(TRUE);

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


@@ -403,7 +399,7 @@ bool wxComboBox::ProcessEditMsg(
             switch(vFlag)
             {
                 case KC_CHAR:
             switch(vFlag)
             {
                 case KC_CHAR:

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

                                        ,lParam
                                        ,TRUE /* isASCII */
                                       ));
                                        ,lParam
                                        ,TRUE /* isASCII */
                                       ));


@@ -419,6 +415,13 @@ bool wxComboBox::ProcessEditMsg(
                                        ));
             }
             break;
                                        ));
             }
             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


@@ -440,6 +443,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