{
if (param == CBN_SELCHANGE)
{
- wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId);
- event.SetInt(GetSelection());
- event.SetEventObject(this);
- event.SetString(copystring(GetStringSelection()));
- ProcessCommand(event);
- delete[] event.GetString();
+ if (GetSelection() > -1)
+ {
+ wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId);
+ event.SetInt(GetSelection());
+ event.SetEventObject(this);
+ event.SetString(GetStringSelection());
+ ProcessCommand(event);
+ }
+
return TRUE;
}
else if (param == CBN_EDITCHANGE)
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
- event.SetString(copystring(GetValue()));
+ event.SetString(GetValue());
event.SetEventObject(this);
ProcessCommand(event);
- delete[] event.GetString();
+
return TRUE;
}
- else return FALSE;
+ else
+ return FALSE;
}
bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;
- m_noStrings = n;
m_windowStyle = style;
int width = size.x;
int height = size.y;
- long msStyle = WS_CHILD | WS_HSCROLL | WS_VSCROLL |
- WS_TABSTOP | WS_VISIBLE | CBS_NOINTEGRALHEIGHT;
+ long msStyle = WS_CHILD | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL |
+ CBS_NOINTEGRALHEIGHT;
if (m_windowStyle & wxCB_READONLY)
msStyle |= CBS_DROPDOWNLIST;
if ( want3D || wxStyleHasBorder(m_windowStyle) )
msStyle |= WS_BORDER;
- m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "COMBOBOX", NULL,
+ m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("COMBOBOX"), NULL,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
- wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" );
+ wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create combobox") );
/*
-#if CTL3D
+#if wxUSE_CTL3D
if (want3D)
{
Ctl3dSubclassCtl(wx_combo);
// Subclass again for purposes of dialog editing mode
SubclassWin(m_hWnd);
- SetFont(* parent->GetFont());
+ SetFont(parent->GetFont());
int i;
for (i = 0; i < n; i++)
{
return TRUE;
}
-wxString wxComboBox::GetValue() const
-{
- return wxGetWindowText(GetHWND());
-}
-
void wxComboBox::SetValue(const wxString& value)
{
// If newlines are denoted by just 10, must stick 13 in front.
}
if (singletons > 0)
{
- char *tmp = new char[len + singletons + 1];
+ wxChar *tmp = new wxChar[len + singletons + 1];
int j = 0;
for (i = 0; i < len; i ++)
{
j ++;
}
tmp[j] = 0;
- SetWindowText((HWND) GetHWND(), tmp);
+ SetWindowText(GetHwnd(), tmp);
delete[] tmp;
}
else
- SetWindowText((HWND) GetHWND(), (const char *)value);
+ SetWindowText(GetHwnd(), value);
}
// Clipboard operations
void wxComboBox::Copy()
{
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
SendMessage(hWnd, WM_COPY, 0, 0L);
}
void wxComboBox::Cut()
{
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
SendMessage(hWnd, WM_CUT, 0, 0L);
}
void wxComboBox::Paste()
{
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
SendMessage(hWnd, WM_PASTE, 0, 0L);
}
void wxComboBox::SetEditable(bool editable)
{
// Can't implement in MSW?
-// HWND hWnd = (HWND) GetHWND();
+// HWND hWnd = GetHwnd();
// SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
}
void wxComboBox::SetInsertionPoint(long pos)
{
/*
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
#ifdef __WIN32__
SendMessage(hWnd, EM_SETSEL, pos, pos);
SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
long wxComboBox::GetInsertionPoint() const
{
/*
- DWORD Pos=(DWORD)SendMessage((HWND) GetHWND(), EM_GETSEL, 0, 0L);
+ DWORD Pos=(DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
return Pos&0xFFFF;
*/
return 0;
long wxComboBox::GetLastPosition() const
{
/*
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
// Will always return a number > 0 (according to docs)
int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L);
// This gets the char index for the _beginning_ of the last line
int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L);
-
+
// Get number of characters in the last line. We'll add this to the character
// index for the last line, 1st position.
int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L);
void wxComboBox::Replace(long from, long to, const wxString& value)
{
#if wxUSE_CLIPBOARD
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
long fromChar = from;
long toChar = to;
-
+
// Set selection and remove it
#ifdef __WIN32__
SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
// Now replace with 'value', by pasting.
- wxSetClipboardData(wxDF_TEXT, (wxObject *)(const char *)value, 0, 0);
+ wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0);
// Paste into edit control
SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
void wxComboBox::Remove(long from, long to)
{
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
long fromChar = from;
long toChar = to;
-
+
// Cut all selected text
#ifdef __WIN32__
SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
void wxComboBox::SetSelection(long from, long to)
{
- HWND hWnd = (HWND) GetHWND();
+ HWND hWnd = GetHwnd();
long fromChar = from;
long toChar = to;
// if from and to are both -1, it means
fromChar = 0;
toChar = -1;
}
-
+
#ifdef __WIN32__
SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar);
// SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
#endif
}
+void wxComboBox::DoSetSize(int x, int y,
+ int width, int height,
+ int sizeFlags)
+{
+ wxControl::DoSetSize(x, y, width, height, sizeFlags);
+}
+
#endif
// wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff