X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/combobox.cpp?ds=sidebyside diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp index 867815ccdf..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: @@ -9,19 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/combobox.h" - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_COMBOBOX + +#include "wx/combobox.h" + #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/settings.h" #endif -#if wxUSE_COMBOBOX - -#include "wx/combobox.h" #include "wx/clipbrd.h" #include "wx/os2/private.h" @@ -39,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((char*)GetStringSelection().c_str()); + 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((char*)GetValue().c_str()); + sValue = GetStringSelection(); + vEvent.SetString(sValue); vEvent.SetEventObject(this); ProcessCommand(vEvent); } @@ -81,11 +73,29 @@ bool wxComboBox::OS2Command( } // // 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( + wxWindow* pParent +, wxWindowID vId +, const wxString& rsValue +, const wxPoint& rPos +, const wxSize& rSize +, const wxArrayString& asChoices +, long lStyle +, const wxValidator& rValidator +, const wxString& rsName +) +{ + wxCArrayString chs(asChoices); + + return Create(pParent, vId, rsValue, rPos, rSize, chs.GetCount(), + chs.GetStrings(), lStyle, rValidator, rsName); +} + bool wxComboBox::Create( wxWindow* pParent , wxWindowID vId @@ -95,25 +105,21 @@ bool wxComboBox::Create( , int n , const wxString asChoices[] , long lStyle -#if wxUSE_VALIDATORS , const wxValidator& rValidator -#endif , const wxString& rsName ) { - m_isShown = FALSE; + m_isShown = false; if (!CreateControl( pParent ,vId ,rPos ,rSize ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName )) - return FALSE; + return false; // // Get the right style @@ -123,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) @@ -133,10 +140,10 @@ bool wxComboBox::Create( lSstyle |= CBS_DROPDOWN; - if (!OS2CreateControl( "COMBOBOX" + if (!OS2CreateControl( _T("COMBOBOX") ,lSstyle )) - return FALSE; + return false; // // A choice/combobox normally has a white background (or other, depending @@ -144,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]); } @@ -157,7 +161,15 @@ bool wxComboBox::Create( ,rSize.x ,rSize.y ); - if (!rsValue.IsEmpty()) + + // 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); } @@ -165,10 +177,15 @@ bool wxComboBox::Create( ,(PFNWP)wxComboEditWndProc ); ::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this); - Show(TRUE); - return TRUE; + Show(true); + return true; } // end of wxComboBox::Create +wxString wxComboBox::GetValue() const +{ + return wxGetWindowText(GetHwnd()); +} + void wxComboBox::SetValue( const wxString& rsValue ) @@ -223,7 +240,7 @@ void wxComboBox::SetInsertionPoint( void wxComboBox::SetInsertionPointEnd() { - long lPos = GetLastPosition(); + wxTextPos lPos = GetLastPosition(); SetInsertionPoint(lPos); } // end of wxComboBox::SetInsertionPointEnd @@ -240,9 +257,8 @@ long wxComboBox::GetInsertionPoint() const return lPos; } // end of wxComboBox::GetInsertionPoint -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { - HWND hEditWnd = GetHwnd(); long lLineLength = 0L; WNDPARAMS vParams; @@ -266,16 +282,12 @@ long wxComboBox::GetLastPosition() const return lLineLength; } // end of wxComboBox::GetLastPosition -void wxComboBox::Replace( - long lFrom -, long lTo -, const wxString& rsValue -) +void wxComboBox::Replace( long lFrom, + long lTo, + const wxString& rsValue ) { #if wxUSE_CLIPBOARD HWND hWnd = GetHwnd(); - long lFromChar = lFrom; - long lToChar = lTo; // // Set selection and remove it @@ -287,7 +299,7 @@ void wxComboBox::Replace( // Now replace with 'value', by pasting. // wxSetClipboardData( wxDF_TEXT - ,(wxObject *)rsValue.c_str() + ,rsValue.c_str() ,0 ,0 ); @@ -296,36 +308,35 @@ void wxComboBox::Replace( // Paste into edit control // ::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0L); +#else + wxUnusedVar(lFrom); + wxUnusedVar(lTo); + wxUnusedVar(rsValue); #endif } // end of wxComboBox::Replace -void wxComboBox::Remove( - long lFrom -, long lTo -) +void wxComboBox::Remove( long lFrom, long lTo) { #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); +#else + wxUnusedVar(lFrom); + wxUnusedVar(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 = lFrom; - long lToChar = lTo; + HWND hWnd = GetHwnd(); + long lFromChar = 0; + long lToChar = 0; // // 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)) @@ -341,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 @@ -372,7 +367,7 @@ bool wxComboBox::ProcessEditMsg( case KC_CHAR: return (HandleChar( wParam ,lParam - ,TRUE /* isASCII */ + ,true /* isASCII */ )); case KC_PREVDOWN: @@ -392,10 +387,9 @@ bool wxComboBox::ProcessEditMsg( return(HandleSetFocus((WXHWND)(HWND)wParam)); else return(HandleKillFocus((WXHWND)(HWND)wParam)); - break; } - return FALSE; -} // end of WinGuiBase_CComboBox::ProcessEditMsg + return false; +} // end of wxComboBox::ProcessEditMsg MRESULT EXPENTRY wxComboEditWndProc( HWND hWnd @@ -404,11 +398,6 @@ MRESULT EXPENTRY wxComboEditWndProc( , MPARAM lParam ) { - HWND hWndCombo; - wxWindow* pWin = NULL; - - hWndCombo = ::WinQueryWindow(hWnd, QW_PARENT); - pWin = (wxWindow*)wxFindWinFromHandle((WXHWND)hWndCombo); switch (uMessage) { // @@ -417,9 +406,9 @@ MRESULT EXPENTRY wxComboEditWndProc( case WM_SETFOCUS: case WM_CHAR: { - wxComboBox* pCombo = wxDynamicCast( pWin - ,wxComboBox - ); + wxComboBox* pCombo = (wxComboBox *)::WinQueryWindowULong( hWnd + ,QWL_USER + ); if (pCombo->ProcessEditMsg( uMessage ,wParam @@ -438,4 +427,3 @@ MRESULT EXPENTRY wxComboEditWndProc( #endif // wxUSE_COMBOBOX -