// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/combobox.h"
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
- #include "wx/setup.h"
+ #include "wx/defs.h"
#include "wx/settings.h"
#endif
switch (uParam)
{
- case LN_SELECT:
+ case CBN_LBSELECT:
if (GetSelection() > -1)
{
wxCommandEvent vEvent( wxEVT_COMMAND_COMBOBOX_SELECTED
vEvent.SetInt(GetSelection());
vEvent.SetEventObject(this);
- vEvent.SetString((char*)GetStringSelection().c_str());
+ vEvent.SetString(GetStringSelection());
ProcessCommand(vEvent);
}
break;
- case EN_CHANGE:
+ case CBN_EFCHANGE:
{
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,GetId()
sValue = GetValue();
else
SetValue(sValue);
- vEvent.SetString((char*)GetValue().c_str());
+ vEvent.SetString(GetValue());
vEvent.SetEventObject(this);
ProcessCommand(vEvent);
}
}
//
// 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
, int n
, const wxString asChoices[]
, long lStyle
-#if wxUSE_VALIDATORS
, const wxValidator& rValidator
-#endif
, const wxString& rsName
)
{
+ m_isShown = false;
if (!CreateControl( pParent
,vId
,rPos
,rSize
,lStyle
-#if wxUSE_VALIDATORS
,rValidator
-#endif
,rsName
))
- return FALSE;
+ return false;
//
// Get the right style
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
//
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
- wxFont* pTextFont = new wxFont( 10
- ,wxMODERN
- ,wxNORMAL
- ,wxNORMAL
- );
- SetFont(*pTextFont);
-
- int i;
- for (i = 0; i < n; i++)
+ for (int i = 0; i < n; i++)
{
Append(asChoices[i]);
}
,rSize.x
,rSize.y
);
- if (!rsValue.IsEmpty())
+ if (!rsValue.empty())
{
SetValue(rsValue);
}
,(PFNWP)wxComboEditWndProc
);
::WinSetWindowULong(GetHwnd(), QWL_USER, (ULONG)this);
- delete pTextFont;
- return TRUE;
+ Show(true);
+ return true;
} // end of wxComboBox::Create
void wxComboBox::SetValue(
const wxString& rsValue
)
{
- //
- // If newlines are denoted by just 10, must stick 13 in front.
- //
- int nSingletons = 0;
- int nLen = rsValue.Length();
- int i;
-
- for (i = 0; i < nLen; i ++)
- {
- if ((i > 0) && (rsValue[i] == 10) && (rsValue[i - 1] != 13))
- nSingletons ++;
- }
- if (nSingletons > 0)
- {
- wxChar* zTmp = new wxChar[nLen + nSingletons + 1];
- int j = 0;
-
- for (i = 0; i < nLen; i ++)
- {
- if ((i > 0) && (rsValue[i] == 10) && (rsValue[i - 1] != 13))
- {
- zTmp[j] = 13;
- j++;
- }
- zTmp[j] = rsValue[i];
- j++;
- }
- zTmp[j] = 0;
- ::WinSetWindowText(GetHwnd(), zTmp);
- delete[] zTmp;
- }
+ if ( HasFlag(wxCB_READONLY) )
+ SetStringSelection(rsValue);
else
- ::WinSetWindowText(GetHwnd(), rsValue.c_str());
+ ::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());
} // end of wxComboBox::SetValue
//
void wxComboBox::SetInsertionPointEnd()
{
- long lPos = GetLastPosition();
+ wxTextPos lPos = GetLastPosition();
SetInsertionPoint(lPos);
} // end of wxComboBox::SetInsertionPointEnd
return lPos;
} // end of wxComboBox::GetInsertionPoint
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
{
- HWND hEditWnd = GetHwnd();
long lLineLength = 0L;
WNDPARAMS vParams;
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
// 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
)
{
HWND hWnd = GetHwnd();
- long lFromChar = lFrom;
- long lToChar = lTo;
+ 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))
switch(vFlag)
{
case KC_CHAR:
- return (HandleChar( SHORT1FROMMP(wParam)
+ return (HandleChar( wParam
,lParam
- ,TRUE /* isASCII */
+ ,true /* isASCII */
));
case KC_PREVDOWN:
- return (HandleKeyDown( SHORT1FROMMP(wParam)
+ return (HandleKeyDown( wParam
,lParam
));
case KC_KEYUP:
- return (HandleKeyUp( SHORT1FROMMP(wParam)
+ return (HandleKeyUp( wParam
,lParam
));
}
break;
+
+ case WM_SETFOCUS:
+ if (SHORT1FROMMP((MPARAM)lParam) == TRUE)
+ return(HandleSetFocus((WXHWND)(HWND)wParam));
+ else
+ return(HandleKillFocus((WXHWND)(HWND)wParam));
}
- return FALSE;
+ return false;
} // end of WinGuiBase_CComboBox::ProcessEditMsg
MRESULT EXPENTRY wxComboEditWndProc(
, MPARAM lParam
)
{
- HWND hWndCombo;
- wxWindow* pWin = NULL;
-
- hWndCombo = ::WinQueryWindow(hWnd, QW_PARENT);
- pWin = (wxWindow*)wxFindWinFromHandle((WXHWND)hWndCombo);
switch (uMessage)
{
//
// Forward some messages to the combobox
//
+ case WM_SETFOCUS:
case WM_CHAR:
{
- wxComboBox* pCombo = wxDynamicCast( pWin
- ,wxComboBox
- );
+ wxComboBox* pCombo = (wxComboBox *)::WinQueryWindowULong( hWnd
+ ,QWL_USER
+ );
if (pCombo->ProcessEditMsg( uMessage
,wParam
#endif
// wxUSE_COMBOBOX
-
projects / wxWidgets.git / blobdiff