X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/598d8cacefaa185a962ebc39d31533410692c56b..01cb1c26171efc494b94d77e4351362bb0eb2e7d:/src/os2/combobox.cpp diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index 927325f758..038fa35ec5 100644 --- a/src/os2/combobox.cpp +++ b/src/os2/combobox.cpp @@ -49,7 +49,7 @@ bool wxComboBox::OS2Command( switch (uParam) { - case LN_SELECT: + case CBN_LBSELECT: if (GetSelection() > -1) { wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED @@ -63,7 +63,7 @@ bool wxComboBox::OS2Command( } break; - case EN_CHANGE: + case CBN_EFCHANGE: { wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED ,GetId() @@ -101,6 +101,7 @@ bool wxComboBox::Create( , const wxString& rsName ) { + m_isShown = FALSE; if (!CreateControl( pParent ,vId @@ -143,12 +144,7 @@ bool wxComboBox::Create( // 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++) @@ -169,7 +165,7 @@ bool wxComboBox::Create( ,(PFNWP)wxComboEditWndProc ); ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this); - delete pTextFont; + Show(TRUE); return TRUE; } // end of wxComboBox::Create