X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/combobox.cpp?ds=sidebyside diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index ccd8e120d9..d3ff05da08 100644 --- a/src/os2/combobox.cpp +++ b/src/os2/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/os2/combobox.cpp // Purpose: wxComboBox class // Author: David Webster // Modified by: @@ -12,14 +12,14 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_COMBOBOX + +#include "wx/combobox.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/settings.h" #endif -#if wxUSE_COMBOBOX - -#include "wx/combobox.h" #include "wx/clipbrd.h" #include "wx/os2/private.h" @@ -37,41 +37,35 @@ static WXFARPROC gfnWndprocEdit = (WXFARPROC)NULL; IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -bool wxComboBox::OS2Command( - WXUINT uParam -, WXWORD WXUNUSED(wId) -) +bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) ) { - long lSel = -1L; - wxString sValue; + long lSel = GetSelection(); + wxString sValue; switch (uParam) { case CBN_LBSELECT: - if (GetSelection() > -1) + if (lSel > -1) { - wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED - ,GetId() - ); + wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() ); - vEvent.SetInt(GetSelection()); + vEvent.SetInt(lSel); vEvent.SetEventObject(this); vEvent.SetString(GetStringSelection()); + ProcessCommand(vEvent); } break; case CBN_EFCHANGE: { - wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED - ,GetId() - ); + wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED, GetId() ); if (lSel == -1L) sValue = GetValue(); else - SetValue(sValue); - vEvent.SetString(GetValue()); + sValue = GetStringSelection(); + vEvent.SetString(sValue); vEvent.SetEventObject(this); ProcessCommand(vEvent); } @@ -135,8 +129,9 @@ bool wxComboBox::Create( lSstyle = WS_TABSTOP | WS_VISIBLE; - if (lStyle & wxCLIP_SIBLINGS ) - lSstyle |= WS_CLIPSIBLINGS; + // clipping siblings does not yet work + // if (lStyle & wxCLIP_SIBLINGS ) + // lSstyle |= WS_CLIPSIBLINGS; if (lStyle & wxCB_READONLY) lSstyle |= CBS_DROPDOWNLIST; else if (lStyle & wxCB_SIMPLE) @@ -156,10 +151,7 @@ bool wxComboBox::Create( // SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - SetFont(*wxSMALL_FONT); - - int i; - for (i = 0; i < n; i++) + for (int i = 0; i < n; i++) { Append(asChoices[i]); } @@ -169,6 +161,14 @@ bool wxComboBox::Create( ,rSize.x ,rSize.y ); + + // Set height to use with sizers i.e. without the dropdown listbox + wxFont vFont = GetFont(); + int nEditHeight; + wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont ); + nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight); + SetInitialSize(wxSize(-1,nEditHeight+4)); // +2x2 for the border + if (!rsValue.empty()) { SetValue(rsValue); @@ -181,6 +181,11 @@ bool wxComboBox::Create( return true; } // end of wxComboBox::Create +wxString wxComboBox::GetValue() const +{ + return wxGetWindowText(GetHwnd()); +} + void wxComboBox::SetValue( const wxString& rsValue ) @@ -188,7 +193,7 @@ void wxComboBox::SetValue( if ( HasFlag(wxCB_READONLY) ) SetStringSelection(rsValue); else - ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str()); + ::WinSetWindowText(GetHwnd(), rsValue.c_str()); } // end of wxComboBox::SetValue // @@ -294,7 +299,7 @@ void wxComboBox::Replace( long lFrom, // Now replace with 'value', by pasting. // wxSetClipboardData( wxDF_TEXT - ,(wxObject *)rsValue.c_str() + ,rsValue.c_str() ,0 ,0 ); @@ -323,14 +328,11 @@ void wxComboBox::Remove( long lFrom, long lTo) #endif } // end of wxComboBox::Remove -void wxComboBox::SetSelection( - long lFrom -, long lTo -) +void wxComboBox::SetSelection( long lFrom, long lTo ) { - HWND hWnd = GetHwnd(); - long lFromChar = 0; - long lToChar = 0; + HWND hWnd = GetHwnd(); + long lFromChar = 0; + long lToChar = 0; // // If from and to are both -1, it means @@ -350,22 +352,6 @@ void wxComboBox::SetSelection( ); } // end of wxComboBox::SetSelection -void wxComboBox::DoSetSize( - int nX -, int nY -, int nWidth -, int nHeight -, int nSizeFlags -) -{ - wxControl::DoSetSize( nX - ,nY - ,nWidth - ,nHeight - ,nSizeFlags - ); -} // end of wxComboBox::DoSetSize - bool wxComboBox::ProcessEditMsg( WXUINT uMsg , WXWPARAM wParam @@ -403,7 +389,7 @@ bool wxComboBox::ProcessEditMsg( return(HandleKillFocus((WXHWND)(HWND)wParam)); } return false; -} // end of WinGuiBase_CComboBox::ProcessEditMsg +} // end of wxComboBox::ProcessEditMsg MRESULT EXPENTRY wxComboEditWndProc( HWND hWnd