// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/setup.h"
#endif
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
#include "wx/combobox.h"
#include "wx/clipbrd.h"
wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId);
event.SetInt(GetSelection());
event.SetEventObject(this);
- event.SetString(copystring(GetStringSelection()));
+ event.SetString(GetStringSelection());
ProcessCommand(event);
- delete[] event.GetString();
+
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,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- int n, const wxString choices[],
- long style,
- const wxValidator& validator,
- const wxString& name)
+ const wxString& value,
+ const wxPoint& pos,
+ const wxSize& size,
+ int n, const wxString choices[],
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
SetName(name);
SetValidator(validator);
if (parent) parent->AddChild(this);
- SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
- SetForegroundColour(parent->GetDefaultForegroundColour()) ;
- no_strings = n;
+ SetBackgroundColour(parent->GetBackgroundColour()) ;
+ SetForegroundColour(parent->GetForegroundColour()) ;
+ m_noStrings = 0;
m_windowStyle = style;
if ( id == -1 )
- m_windowId = (int)NewControlId();
+ m_windowId = (int)NewControlId();
else
- m_windowId = id;
+ m_windowId = id;
int x = pos.x;
int y = pos.y;
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_HSCROLL | WS_VSCROLL |
+ WS_TABSTOP | WS_VISIBLE | CBS_NOINTEGRALHEIGHT;
+
if (m_windowStyle & wxCB_READONLY)
msStyle |= CBS_DROPDOWNLIST;
- else if (m_windowStyle & wxCB_SIMPLE) // A list (shown always) and edit control
- msStyle |= CBS_SIMPLE;
+ else if (m_windowStyle & wxCB_SIMPLE)
+ msStyle |= CBS_SIMPLE; // A list (shown always) and edit control
else
msStyle |= CBS_DROPDOWN;
// Even with extended styles, need to combine with WS_BORDER
// for them to look right.
- if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
- (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
+ if ( want3D || wxStyleHasBorder(m_windowStyle) )
msStyle |= WS_BORDER;
- HWND wx_combo = CreateWindowEx(exStyle, "COMBOBOX", NULL,
+ m_hWnd = (WXHWND)::CreateWindowEx(exStyle, _T("COMBOBOX"), NULL,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
+
+ wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create combobox") );
+
/*
-#if CTL3D
+#if wxUSE_CTL3D
if (want3D)
{
Ctl3dSubclassCtl(wx_combo);
#endif
*/
- m_hWnd = (WXHWND)wx_combo;
-
// Subclass again for purposes of dialog editing mode
- SubclassWin((WXHWND)wx_combo);
+ SubclassWin(m_hWnd);
- SetFont(* parent->GetFont());
+ SetFont(parent->GetFont());
int i;
for (i = 0; i < n; i++)
- SendMessage(wx_combo, CB_INSERTSTRING, i, (LONG)(const char *)choices[i]);
- SendMessage(wx_combo, CB_SETCURSEL, i, 0);
+ {
+ Append(choices[i]);
+ }
+
+ SetSelection(i);
SetSize(x, y, width, height);
- if ( value != "" )
- SetWindowText(wx_combo, (const char *)value);
+ if ( !value.IsEmpty() )
+ {
+ SetValue(value);
+ }
return TRUE;
}
-wxString wxComboBox::GetValue(void) const
+wxString wxComboBox::GetValue() const
{
- GetWindowText((HWND) GetHWND(), wxBuffer, 500);
- return wxString(wxBuffer);
+ return wxGetWindowText(GetHWND());
}
void wxComboBox::SetValue(const wxString& value)
}
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 ++)
{
delete[] tmp;
}
else
- SetWindowText((HWND) GetHWND(), (const char *)value);
+ SetWindowText((HWND) GetHWND(), (const wxChar *)value);
}
// Clipboard operations
-void wxComboBox::Copy(void)
+void wxComboBox::Copy()
{
HWND hWnd = (HWND) GetHWND();
SendMessage(hWnd, WM_COPY, 0, 0L);
}
-void wxComboBox::Cut(void)
+void wxComboBox::Cut()
{
HWND hWnd = (HWND) GetHWND();
SendMessage(hWnd, WM_CUT, 0, 0L);
}
-void wxComboBox::Paste(void)
+void wxComboBox::Paste()
{
HWND hWnd = (HWND) GetHWND();
SendMessage(hWnd, WM_PASTE, 0, 0L);
*/
}
-void wxComboBox::SetInsertionPointEnd(void)
+void wxComboBox::SetInsertionPointEnd()
{
/*
long pos = GetLastPosition();
*/
}
-long wxComboBox::GetInsertionPoint(void) const
+long wxComboBox::GetInsertionPoint() const
{
/*
DWORD Pos=(DWORD)SendMessage((HWND) GetHWND(), EM_GETSEL, 0, 0L);
return 0;
}
-long wxComboBox::GetLastPosition(void) const
+long wxComboBox::GetLastPosition() const
{
/*
HWND hWnd = (HWND) GetHWND();
void wxComboBox::Replace(long from, long to, const wxString& value)
{
-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD
HWND hWnd = (HWND) GetHWND();
long fromChar = from;
long toChar = to;
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);
}
#endif
- // USE_COMBOBOX
+ // wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff