bool wxComboBox::OS2Command( WXUINT uParam, WXWORD WXUNUSED(wId) )
{
- long lSel = -1L;
+ long lSel = GetSelection();
wxString sValue;
switch (uParam)
{
case CBN_LBSELECT:
- if (GetSelection() > -1)
+ if (lSel > -1)
{
wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
- vEvent.SetInt(GetSelection());
+ vEvent.SetInt(lSel);
vEvent.SetEventObject(this);
vEvent.SetString(GetStringSelection());
if (lSel == -1L)
sValue = GetValue();
else
- SetValue(sValue);
- vEvent.SetString(GetValue());
+ sValue = GetStringSelection();
+ vEvent.SetString(sValue);
vEvent.SetEventObject(this);
ProcessCommand(vEvent);
}
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)
lSstyle |= CBS_DROPDOWN;
- if (!OS2CreateControl( _T("COMBOBOX")
+ if (!OS2CreateControl( wxT("COMBOBOX")
,lSstyle
))
return false;
,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);
return true;
} // end of wxComboBox::Create
-void wxComboBox::SetValue(
- const wxString& rsValue
-)
-{
- if ( HasFlag(wxCB_READONLY) )
- SetStringSelection(rsValue);
- else
- ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());
-} // end of wxComboBox::SetValue
-
-//
-// Clipboard operations
-//
-void wxComboBox::Copy()
-{
- HWND hWnd = GetHwnd();
-
- ::WinSendMsg(hWnd, EM_COPY, (MPARAM)0, (MPARAM)0);
-} // end of wxComboBox::Copy
-
-void wxComboBox::Cut()
+wxString wxComboBox::GetValue() const
{
- HWND hWnd = GetHwnd();
-
- ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);
-} // end of wxComboBox::Cut
-
-void wxComboBox::Paste()
-{
- HWND hWnd = GetHwnd();
-
- ::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0);
-} // end of wxComboBox::Paste
-
-void wxComboBox::SetEditable(
- bool bEditable
-)
-{
- HWND hWnd = GetHwnd();
-
- ::WinSendMsg(hWnd, EM_SETREADONLY, (MPARAM)!bEditable, (MPARAM)0L);
-} // end of wxComboBox::SetEditable
-
-void wxComboBox::SetInsertionPoint(
- long lPos
-)
-{
- HWND hWnd = GetHwnd();
-
- ::WinSendMsg(hWnd, EM_SETFIRSTCHAR, MPFROMLONG(lPos), (MPARAM)0);
-} // end of wxComboBox::SetInsertionPoint
-
-void wxComboBox::SetInsertionPointEnd()
-{
- wxTextPos lPos = GetLastPosition();
-
- SetInsertionPoint(lPos);
-} // end of wxComboBox::SetInsertionPointEnd
+ return HasFlag(wxCB_READONLY) ? GetStringSelection()
+ : wxTextEntry::GetValue();
+}
-long wxComboBox::GetInsertionPoint() const
+void wxComboBox::SetValue(const wxString& value)
{
- long lPos = LONGFROMMR(::WinSendMsg( GetHwnd()
- ,LM_QUERYSELECTION
- ,(MPARAM)0
- ,(MPARAM)0
- ));
- if (lPos == LIT_NONE)
- return wxNOT_FOUND;
- return lPos;
-} // end of wxComboBox::GetInsertionPoint
-
-wxTextPos wxComboBox::GetLastPosition() const
-{
- long lLineLength = 0L;
- WNDPARAMS vParams;
-
- //
- // Get number of characters in the last (only) line. We'll add this to the character
- // index for the last line, 1st position.
- //
-
-
- vParams.fsStatus = WPM_CCHTEXT;
- if (::WinSendMsg( GetHwnd()
- ,WM_QUERYWINDOWPARAMS
- ,&vParams
- ,0
- ))
- {
- lLineLength = (long)vParams.cchText;
- }
+ if ( HasFlag(wxCB_READONLY) )
+ SetStringSelection(value);
else
- lLineLength = 0L;
- return lLineLength;
-} // end of wxComboBox::GetLastPosition
-
-void wxComboBox::Replace( long lFrom,
- long lTo,
- const wxString& rsValue )
-{
-#if wxUSE_CLIPBOARD
- HWND hWnd = GetHwnd();
-
- //
- // Set selection and remove it
- //
- ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFrom, (USHORT)lTo), 0);
- ::WinSendMsg(hWnd, EM_CUT, (MPARAM)0, (MPARAM)0);
-
- //
- // Now replace with 'value', by pasting.
- //
- wxSetClipboardData( wxDF_TEXT
- ,(wxObject *)rsValue.c_str()
- ,0
- ,0
- );
-
- //
- // 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)
-{
-#if wxUSE_CLIPBOARD
- HWND hWnd = GetHwnd();
-
- ::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
+ wxTextEntry::SetValue(value);
+}
-void wxComboBox::SetSelection( long lFrom, long lTo )
+void wxComboBox::Clear()
{
- HWND hWnd = GetHwnd();
- long lFromChar = 0;
- long lToChar = 0;
-
- //
- // If from and to are both -1, it means
- // (in wxWidgets) that all text should be selected.
- // This translates into Windows convention
- //
- if ((lFrom == -1L) && (lTo == -1L))
- {
- lFromChar = 0;
- lToChar = -1;
- }
+ wxChoice::Clear();
+ if ( !HasFlag(wxCB_READONLY) )
+ wxTextEntry::Clear();
+}
- ::WinSendMsg( hWnd
- ,EM_SETSEL
- ,MPFROM2SHORT((USHORT)lFromChar, (USHORT)lToChar)
- ,(MPARAM)0
- );
-} // end of wxComboBox::SetSelection
-
-void wxComboBox::DoSetSize(
- int nX
-, int nY
-, int nWidth
-, int nHeight
-, int nSizeFlags
-)
+bool wxComboBox::IsEditable() const
{
- wxControl::DoSetSize( nX
- ,nY
- ,nWidth
- ,nHeight
- ,nSizeFlags
- );
-} // end of wxComboBox::DoSetSize
+ return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable();
+}
bool wxComboBox::ProcessEditMsg(
WXUINT uMsg
return(HandleKillFocus((WXHWND)(HWND)wParam));
}
return false;
-} // end of WinGuiBase_CComboBox::ProcessEditMsg
+} // end of wxComboBox::ProcessEditMsg
MRESULT EXPENTRY wxComboEditWndProc(
HWND hWnd
projects / wxWidgets.git / blobdiff