#if !defined( __WXMSW__ ) || defined( __WIN95__ )
#include "wx/spinbutt.h"
#endif
+#include "wx/tglbtn.h"
#include "wx/notebook.h"
#include "wx/imaglist.h"
#include "wx/tooltip.h"
#endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#define USE_XPM
#endif
#include "wx/progdlg.h"
-// VZ: this is a temp. hack, will remove soon
-#ifndef wxUSE_SPINCTRL
-#define wxUSE_SPINCTRL 1
-#endif
-
#if wxUSE_SPINCTRL
#include "wx/spinctrl.h"
#endif // wxUSE_SPINCTRL
void OnListBox( wxCommandEvent &event );
void OnListBoxDoubleClick( wxCommandEvent &event );
void OnListBoxButtons( wxCommandEvent &event );
+#if wxUSE_CHOICE
void OnChoice( wxCommandEvent &event );
void OnChoiceButtons( wxCommandEvent &event );
+#endif
void OnCombo( wxCommandEvent &event );
+ void OnComboTextChanged( wxCommandEvent &event );
+ void OnComboTextEnter( wxCommandEvent &event );
void OnComboButtons( wxCommandEvent &event );
void OnRadio( wxCommandEvent &event );
void OnRadioButtons( wxCommandEvent &event );
void OnEnableAll(wxCommandEvent& event);
void OnChangeColour(wxCommandEvent& event);
+ void OnTestButton(wxCommandEvent& event);
+ void OnBmpButton(wxCommandEvent& event);
wxListBox *m_listbox,
*m_listboxSorted;
+#if wxUSE_CHOICE
wxChoice *m_choice,
*m_choiceSorted;
+#endif
wxComboBox *m_combo;
wxRadioBox *m_radio;
- wxGauge *m_gauge;
+ wxGauge *m_gauge,
+ *m_gaugeVert;
wxSlider *m_slider;
wxButton *m_fontButton;
wxButton *m_lbSelectNum;
wxStaticText *m_label;
private:
+ wxLog *m_logTargetOld;
+
DECLARE_EVENT_TABLE()
};
class MyFrame: public wxFrame
{
public:
- MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
+ MyFrame(const char *title, int x, int y);
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
+ void OnClearLog(wxCommandEvent& event);
#if wxUSE_TOOLTIPS
void OnSetTooltipDelay(wxCommandEvent& event);
void OnSize( wxSizeEvent& event );
void OnMove( wxMoveEvent& event );
+ MyPanel *GetPanel() const { return m_panel; }
+
private:
void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
{
- wxString msg;
- msg.Printf(_("pos=(%d, %d), size=%dx%d"),
- pos.x, pos.y, size.x, size.y);
- SetStatusText(msg, 1);
+ if ( m_frameStatusBar )
+ {
+ wxString msg;
+ wxSize sizeCl = GetClientSize();
+ msg.Printf(_("pos=(%d, %d), size=%dx%d (client=%dx%d)"),
+ pos.x, pos.y,
+ size.x, size.y,
+ sizeCl.x, sizeCl.y);
+ SetStatusText(msg, 1);
+ }
}
- wxPanel *m_panel;
+ MyPanel *m_panel;
+
+ DECLARE_EVENT_TABLE()
+};
+
+// a button which intercepts double clicks (for testing...)
+class MyButton : public wxButton
+{
+public:
+ MyButton(wxWindow *parent,
+ wxWindowID id,
+ const wxString& label = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize)
+ : wxButton(parent, id, label, pos, size)
+ {
+ }
+
+ void OnDClick(wxMouseEvent& event)
+ {
+ wxLogMessage(_T("MyButton::OnDClick"));
+
+ event.Skip();
+ }
+
+private:
+ DECLARE_EVENT_TABLE()
+};
+
+// a combo which intercepts chars (to test Windows behaviour)
+class MyComboBox : public wxComboBox
+{
+public:
+ MyComboBox(wxWindow *parent, wxWindowID id,
+ const wxString& value = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxComboBoxNameStr)
+ : wxComboBox(parent, id, value, pos, size, n, choices, style,
+ validator, name) { }
+
+protected:
+ void OnChar(wxKeyEvent& event);
+ void OnKeyDown(wxKeyEvent& event);
+ void OnKeyUp(wxKeyEvent& event);
+ void OnFocusGot(wxFocusEvent& event)
+ {
+ wxLogMessage(_T("MyComboBox::OnFocusGot"));
+
+ event.Skip();
+ }
+
+private:
+ DECLARE_EVENT_TABLE()
+};
+
+// a radiobox which handles focus set/kill (for testing)
+class MyRadioBox : public wxRadioBox
+{
+public:
+ MyRadioBox(wxWindow *parent,
+ wxWindowID id,
+ const wxString& title = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ int n = 0, const wxString choices[] = NULL,
+ int majorDim = 1,
+ long style = wxRA_HORIZONTAL,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxRadioBoxNameStr)
+ : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim,
+ style, validator, name) { }
+
+protected:
+ void OnFocusGot(wxFocusEvent& event)
+ {
+ wxLogMessage(_T("MyRadioBox::OnFocusGot"));
+
+ event.Skip();
+ }
+
+ void OnFocusLost(wxFocusEvent& event)
+ {
+ wxLogMessage(_T("MyRadioBox::OnFocusLost"));
+
+ event.Skip();
+ }
+private:
DECLARE_EVENT_TABLE()
};
// other
//----------------------------------------------------------------------
-static void SetControlClientData(const char *name,
- wxControlWithItems *control);
+static void SetListboxClientData(const wxChar *name, wxListBox *control);
+static void SetChoiceClientData(const wxChar *name, wxChoice *control);
IMPLEMENT_APP(MyApp)
enum
{
- MINIMAL_QUIT = 100,
- MINIMAL_TEXT,
- MINIMAL_ABOUT,
+ CONTROLS_QUIT = 100,
+ CONTROLS_TEXT,
+ CONTROLS_ABOUT,
+ CONTROLS_CLEAR_LOG,
// tooltip menu
- MINIMAL_SET_TOOLTIP_DELAY = 200,
- MINIMAL_ENABLE_TOOLTIPS,
+ CONTROLS_SET_TOOLTIP_DELAY = 200,
+ CONTROLS_ENABLE_TOOLTIPS,
// panel menu
- MINIMAL_ENABLE_ALL
+ CONTROLS_ENABLE_ALL
};
bool MyApp::OnInit()
{
- // Create the main frame window
- MyFrame *frame = new MyFrame((wxFrame *) NULL,
- "Controls wxWindows App",
- 50, 50, 530, 420);
-
- // Give it an icon
- // The wxICON() macros loads an icon from a resource under Windows
- // and uses an #included XPM image under GTK+ and Motif
-
- frame->SetIcon( wxICON(mondrian) );
-
- wxMenu *file_menu = new wxMenu("", wxMENU_TEAROFF );
- file_menu->Append(MINIMAL_ABOUT, "&About\tF1");
- file_menu->AppendSeparator();
- file_menu->Append(MINIMAL_QUIT, "E&xit\tAlt-X", "Quit controls sample");
-
- wxMenuBar *menu_bar = new wxMenuBar;
- menu_bar->Append(file_menu, "&File");
-
-#if wxUSE_TOOLTIPS
- wxMenu *tooltip_menu = new wxMenu;
- tooltip_menu->Append(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");
- tooltip_menu->AppendSeparator();
- tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T",
- "enable/disable tooltips", TRUE);
- tooltip_menu->Check(MINIMAL_ENABLE_TOOLTIPS, TRUE);
- menu_bar->Append(tooltip_menu, "&Tooltips");
-#endif // wxUSE_TOOLTIPS
-
- wxMenu *panel_menu = new wxMenu;
- panel_menu->Append(MINIMAL_ENABLE_ALL, "&Disable all\tCtrl-E",
- "Enable/disable all panel controls", TRUE);
- menu_bar->Append(panel_menu, "&Panel");
-
- frame->SetMenuBar(menu_bar);
+ // use standard command line handling:
+ if ( !wxApp::OnInit() )
+ return FALSE;
+
+ // parse the cmd line
+ int x = 50,
+ y = 50;
+ if ( argc == 3 )
+ {
+ wxSscanf(wxString(argv[1]), wxT("%d"), &x);
+ wxSscanf(wxString(argv[2]), wxT("%d"), &y);
+ }
+ // Create the main frame window
+ MyFrame *frame = new MyFrame("Controls wxWindows App", x, y);
frame->Show(TRUE);
- frame->SetCursor(wxCursor(wxCURSOR_HAND));
-
- SetTopWindow(frame);
return TRUE;
}
const int ID_BUTTON_LABEL = 184;
const int ID_SPINCTRL = 185;
+const int ID_BUTTON_TEST1 = 190;
+const int ID_BUTTON_TEST2 = 191;
+const int ID_BITMAP_BTN = 192;
+
const int ID_CHANGE_COLOUR = 200;
BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_BUTTON (ID_LISTBOX_DELETE, MyPanel::OnListBoxButtons)
EVT_BUTTON (ID_LISTBOX_FONT, MyPanel::OnListBoxButtons)
EVT_CHECKBOX (ID_LISTBOX_ENABLE, MyPanel::OnListBoxButtons)
+#if wxUSE_CHOICE
EVT_CHOICE (ID_CHOICE, MyPanel::OnChoice)
EVT_CHOICE (ID_CHOICE_SORTED, MyPanel::OnChoice)
EVT_BUTTON (ID_CHOICE_SEL_NUM, MyPanel::OnChoiceButtons)
EVT_BUTTON (ID_CHOICE_DELETE, MyPanel::OnChoiceButtons)
EVT_BUTTON (ID_CHOICE_FONT, MyPanel::OnChoiceButtons)
EVT_CHECKBOX (ID_CHOICE_ENABLE, MyPanel::OnChoiceButtons)
+#endif
EVT_COMBOBOX (ID_COMBO, MyPanel::OnCombo)
+EVT_TEXT (ID_COMBO, MyPanel::OnComboTextChanged)
+EVT_TEXT_ENTER(ID_COMBO, MyPanel::OnComboTextEnter)
EVT_BUTTON (ID_COMBO_SEL_NUM, MyPanel::OnComboButtons)
EVT_BUTTON (ID_COMBO_SEL_STR, MyPanel::OnComboButtons)
EVT_BUTTON (ID_COMBO_CLEAR, MyPanel::OnComboButtons)
EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress)
#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
-EVT_SPIN (ID_SPINCTRL, MyPanel::OnSpinCtrl)
+EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl)
#endif // wxUSE_SPINCTRL
-EVT_BUTTON (ID_BUTTON_LABEL, MyPanel::OnUpdateLabel)
+#if wxUSE_TOGGLEBTN
+EVT_TOGGLEBUTTON(ID_BUTTON_LABEL, MyPanel::OnUpdateLabel)
+#endif // wxUSE_TOGGLEBTN
EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour)
+EVT_BUTTON (ID_BUTTON_TEST1, MyPanel::OnTestButton)
+EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton)
+EVT_BUTTON (ID_BITMAP_BTN, MyPanel::OnBmpButton)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyButton, wxButton)
+ EVT_LEFT_DCLICK(MyButton::OnDClick)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyComboBox, wxComboBox)
+ EVT_CHAR(MyComboBox::OnChar)
+ EVT_KEY_DOWN(MyComboBox::OnKeyDown)
+ EVT_KEY_UP(MyComboBox::OnKeyUp)
+
+ EVT_SET_FOCUS(MyComboBox::OnFocusGot)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox)
+ EVT_SET_FOCUS(MyRadioBox::OnFocusGot)
+ EVT_KILL_FOCUS(MyRadioBox::OnFocusLost)
END_EVENT_TABLE()
+// ============================================================================
+// implementation
+// ============================================================================
+
MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
: wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
m_text(NULL), m_notebook(NULL)
{
- m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
- // m_text->SetBackgroundColour("wheat");
+ wxLayoutConstraints *c;
+
+ m_text = new wxTextCtrl(this, -1, "This is the log window.\n",
+ wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
+ m_text->SetBackgroundColour(wxT("wheat"));
- delete wxLog::SetActiveTarget(new wxLogStderr);
+ if ( 0 )
+ wxLog::AddTraceMask(_T("focus"));
+ m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
- m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
+ m_notebook = new wxNotebook(this, ID_NOTEBOOK);
wxString choices[] =
{
wxBitmap bmp(s_iconNames[n]);
if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
{
- wxLogWarning("Couldn't load the image '%s' for the notebook page %d.",
+ wxLogWarning(wxT("Couldn't load the image '%s' for the notebook page %d."),
s_iconNames[n], n);
}
}
wxPoint(10,90), wxSize(120,70),
5, choices, wxLB_SORT );
- SetControlClientData("listbox", m_listbox);
- SetControlClientData("listbox", m_listboxSorted);
+ SetListboxClientData(wxT("listbox"), m_listbox);
+ SetListboxClientData(wxT("listbox"), m_listboxSorted);
m_listbox->SetCursor(*wxCROSS_CURSOR);
#if wxUSE_TOOLTIPS
m_listbox->SetToolTip( "This is a list box" );
#endif // wxUSE_TOOLTIPS
- m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
- m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
- wxButton *button = new wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+ m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
+ m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_LISTBOX_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) );
+ (void)new MyButton( panel, ID_LISTBOX_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_LISTBOX_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
+ wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+
+ button->SetDefault();
+
+ button->SetForegroundColour(*wxBLUE);
+
#if wxUSE_TOOLTIPS
button->SetToolTip( "Press here to set italic font" );
#endif // wxUSE_TOOLTIPS
#endif // wxUSE_TOOLTIPS
(void)new wxCheckBox( panel, ID_CHANGE_COLOUR, "&Toggle colour",
wxPoint(110,170) );
+ panel->SetCursor(wxCursor(wxCURSOR_HAND));
m_notebook->AddPage(panel, "wxListBox", TRUE, Image_List);
+#if wxUSE_CHOICE
panel = new wxPanel(m_notebook);
m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );
m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1),
5, choices, wxCB_SORT );
- SetControlClientData("choice", m_choice);
- SetControlClientData("choice", m_choiceSorted);
+ SetChoiceClientData(wxT("choice"), m_choice);
+ SetChoiceClientData(wxT("choice"), m_choiceSorted);
m_choice->SetSelection(2);
- m_choice->SetBackgroundColour( "red" );
- (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
- (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
+ m_choice->SetBackgroundColour( wxT("red") );
+ (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+ (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) );
m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
+#endif // wxUSE_CHOICE
panel = new wxPanel(m_notebook);
- m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices, wxCB_READONLY );
- (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
- (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
+ (void)new wxStaticBox( panel, -1, "&Box around combobox",
+ wxPoint(5, 5), wxSize(150, 100));
+ m_combo = new MyComboBox( panel, ID_COMBO, "This",
+ wxPoint(20,25), wxSize(120, -1),
+ 5, choices,
+ /* wxCB_READONLY | */ wxPROCESS_ENTER);
+
+ (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+ (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) );
m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
wxString choices2[] =
};
panel = new wxPanel(m_notebook);
- (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
- m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
- (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) );
- m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) );
- (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) );
- wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP );
+ (void)new MyRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
+ m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
+
+#if wxUSE_TOOLTIPS
+ m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?");
+ m_radio->SetToolTip("Ever seen a radiobox?");
+#endif // wxUSE_TOOLTIPS
+
+ (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "&Select 'This'", wxPoint(180,80), wxSize(140,30) );
+ m_fontButton = new wxButton( panel, ID_SET_FONT, "Set &more Italic font", wxPoint(340,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set &Italic font", wxPoint(340,80), wxSize(140,30) );
+ (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "&Disable", wxPoint(340,130), wxDefaultSize );
+ wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
rb->SetValue( FALSE );
- (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) );
+ (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "&Radiobutton2", wxPoint(340,170), wxDefaultSize );
m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
panel = new wxPanel(m_notebook);
- (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(200,130) );
- m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) );
- m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1), wxSL_LABELS );
- (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(220,10), wxSize(270,130) );
+ (void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(222,130) );
+ m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
+ m_gauge->SetBackgroundColour(*wxGREEN);
+ m_gauge->SetForegroundColour(*wxRED);
+ m_gaugeVert = new wxGauge( panel, -1, 100,
+ wxPoint(195,35), wxSize(30, 90),
+ wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
+ m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1),
+ wxSL_AUTOTICKS | wxSL_LABELS );
+ m_slider->SetTickFreq(40, 0);
+ (void)new wxStaticBox( panel, -1, "&Explanation", wxPoint(230,10), wxSize(270,130) );
#ifdef __WXMOTIF__
// No wrapping text in wxStaticText yet :-(
(void)new wxStaticText( panel, -1,
"Drag the slider!",
- wxPoint(228,30),
+ wxPoint(250,30),
wxSize(240, -1)
);
#else
"\n"
"This is also supposed to demonstrate how\n"
"to use static controls.\n",
- wxPoint(228,25),
+ wxPoint(250,25),
wxSize(240, 110)
);
#endif
m_spinbutton->SetRange(-10,30);
m_spinbutton->SetValue(initialSpinValue);
- m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog",
+ m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog",
wxPoint(300, 160) );
#endif // wxUSE_SPINBTN
panel = new wxPanel(m_notebook);
-#ifndef __WXMOTIF__ // wxStaticBitmap not working under Motif yet. MB
+#if !defined(__WXMOTIF__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
- wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxPoint(10, 10));
+ wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
+ wxPoint(10, 10));
bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION));
wxMemoryDC dc;
dc.SelectObject( bitmap );
dc.SetPen(*wxGREEN_PEN);
+ dc.Clear();
dc.DrawEllipse(5, 5, 90, 90);
- dc.DrawText("Bitmap", 20, 20);
+ dc.DrawText("Bitmap", 30, 40);
dc.SelectObject( wxNullBitmap );
- (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20));
- (void)new wxButton(panel, ID_BUTTON_LABEL, "Toggle label", wxPoint(250, 20));
- m_label = new wxStaticText(panel, -1, "Label with some long text",
- wxPoint(250, 60), wxDefaultSize,
- wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
+ (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
- m_notebook->AddPage(panel, "wxBitmapXXX");
+#ifdef __WXMSW__
+ // test for masked bitmap display
+ bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP);
+ if (bitmap.Ok())
+ {
+ bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
-// --------------- TEST CODE ----------------------
+ (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
+ }
+#endif
- // layout constraints
+ wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
+ bmp2(wxTheApp->GetStdIcon(wxICON_WARNING)),
+ bmp3(wxTheApp->GetStdIcon(wxICON_QUESTION));
+ wxBitmapButton *bmpBtn = new wxBitmapButton
+ (
+ panel, -1,
+ bmp1,
+ wxPoint(30, 70)
+ );
- panel = new wxPanel(m_notebook);
- panel->SetAutoLayout( TRUE );
+ bmpBtn->SetBitmapSelected(bmp2);
+ bmpBtn->SetBitmapFocus(bmp3);
- wxLayoutConstraints *c;
- c = new wxLayoutConstraints;
- c->top.SameAs( panel, wxTop, 10 );
- c->height.AsIs( );
- c->left.SameAs( panel, wxLeft, 10 );
- c->width.PercentOf( panel, wxWidth, 40 );
+#if wxUSE_TOGGLEBTN
+ (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
+ "&Toggle label", wxPoint(250, 20));
+#endif // wxUSE_TOGGLEBTN
- wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
- pMyButton->SetConstraints( c );
+ m_label = new wxStaticText(panel, -1, "Label with some long text",
+ wxPoint(250, 60), wxDefaultSize,
+ wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
+ m_label->SetForegroundColour( *wxBLUE );
- c = new wxLayoutConstraints;
- c->top.SameAs( panel, wxTop, 10 );
- c->bottom.SameAs( panel, wxBottom, 10 );
- c->right.SameAs( panel, wxRight, 10 );
- c->width.PercentOf( panel, wxWidth, 40 );
+ m_notebook->AddPage(panel, "wxBitmapXXX");
- wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
- pMyButton2->SetConstraints( c );
+ // layout constraints
- m_notebook->AddPage(panel, "wxLayoutConstraint");
+ panel = new wxPanel(m_notebook);
+ panel->SetAutoLayout( TRUE );
- // sizer
+ c = new wxLayoutConstraints;
+ c->top.SameAs( panel, wxTop, 10 );
+ c->height.AsIs( );
+ c->left.SameAs( panel, wxLeft, 10 );
+ c->width.PercentOf( panel, wxWidth, 40 );
- panel = new wxPanel(m_notebook);
- panel->SetAutoLayout( TRUE );
+ wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, "Test Button &1" );
+ pMyButton->SetConstraints( c );
- wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+ c = new wxLayoutConstraints;
+ c->top.SameAs( panel, wxTop, 10 );
+ c->bottom.SameAs( panel, wxBottom, 10 );
+ c->right.SameAs( panel, wxRight, 10 );
+ c->width.PercentOf( panel, wxWidth, 40 );
- sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, wxALL, 10 );
- sizer->Add( 20,20, 1 );
- sizer->Add( new wxButton(panel, -1, "Test Button 2" ), 3, wxGROW|wxALL, 10 );
+ wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, "Test Button &2" );
+ pMyButton2->SetConstraints( c );
- panel->SetSizer( sizer );
+ m_notebook->AddPage(panel, "wxLayoutConstraint");
- m_notebook->AddPage(panel, "wxSizer");
+ // sizer
-// --------------- TEST CODE ----------------------
+ panel = new wxPanel(m_notebook);
+ panel->SetAutoLayout( TRUE );
+
+ wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+
+ sizer->Add( new wxButton(panel, -1, "Test Button &1" ), 3, wxALL, 10 );
+ sizer->Add( 20,20, 1 );
+ sizer->Add( new wxButton(panel, -1, "Test Button &2" ), 3, wxGROW|wxALL, 10 );
+ panel->SetSizer( sizer );
+
+ m_notebook->AddPage(panel, "wxSizer");
}
void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
"page change from taking place - if you select\n"
"[No] the current page will stay the third one\n",
"Control sample",
- wxICON_QUESTION | wxYES_NO) != wxYES )
+ wxICON_QUESTION | wxYES_NO, this) != wxYES )
{
event.Veto();
}
}
- *m_text << "Notebook selection is being changed from " << selOld << "\n";
+ *m_text << "Notebook selection is being changed from " << selOld
+ << " to " << event.GetSelection()
+ << " (current page from notebook is "
+ << m_notebook->GetSelection() << ")\n";
}
void MyPanel::OnPageChanged( wxNotebookEvent &event )
{
- *m_text << "Notebook selection is " << event.GetSelection() << "\n";
+ *m_text << "Notebook selection is now " << event.GetSelection()
+ << " (from notebook: " << m_notebook->GetSelection() << ")\n";
+}
+
+void MyPanel::OnTestButton(wxCommandEvent& event)
+{
+ wxLogMessage(_T("Button %c clicked."),
+ event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2'));
+}
+
+void MyPanel::OnBmpButton(wxCommandEvent& event)
+{
+ wxLogMessage(_T("Bitmap button clicked."));
}
void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
SetBackgroundColour(s_colOld);
s_colOld = wxNullColour;
- m_lbSelectThis->SetBackgroundColour("blue");
+ m_lbSelectThis->SetForegroundColour(wxT("red"));
+ m_lbSelectThis->SetBackgroundColour(wxT("white"));
}
else
{
- s_colOld = GetBackgroundColour();
- SetBackgroundColour("green");
+ s_colOld = wxColour(wxT("red"));
+ SetBackgroundColour(wxT("white"));
- m_lbSelectThis->SetBackgroundColour("red");
+ m_lbSelectThis->SetForegroundColour(wxT("white"));
+ m_lbSelectThis->SetBackgroundColour(wxT("red"));
}
m_lbSelectThis->Refresh();
void MyPanel::OnListBox( wxCommandEvent &event )
{
+// GetParent()->Move(100, 100);
+
+ if (event.GetInt() == -1)
+ {
+ m_text->AppendText( "ListBox has no selections anymore\n" );
+ return;
+ }
+
wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
: m_listboxSorted;
wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
m_text->AppendText( "ListBox event client data string is: '" );
if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
- m_text->AppendText( obj->GetData() );
+ m_text->AppendText( obj->GetData() );
else
- m_text->AppendText( wxString("none") );
+ m_text->AppendText( wxString("none") );
m_text->AppendText( "'\n" );
m_text->AppendText( "ListBox control client data string is: '" );
obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
if (obj)
- m_text->AppendText( obj->GetData() );
+ m_text->AppendText( obj->GetData() );
else
- m_text->AppendText( wxString("none") );
+ m_text->AppendText( wxString("none") );
m_text->AppendText( "'\n" );
}
case ID_LISTBOX_ENABLE:
{
m_text->AppendText("Checkbox clicked.\n");
- wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
#if wxUSE_TOOLTIPS
+ wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
if (event.GetInt())
cb->SetToolTip( "Click to enable listbox" );
else
cb->SetToolTip( "Click to disable listbox" );
#endif // wxUSE_TOOLTIPS
m_listbox->Enable( event.GetInt() == 0 );
+ m_lbSelectThis->Enable( event.GetInt() == 0 );
+ m_lbSelectNum->Enable( event.GetInt() == 0 );
m_listboxSorted->Enable( event.GetInt() == 0 );
+ FindWindow(ID_CHANGE_COLOUR)->Enable( event.GetInt() == 0 );
break;
}
case ID_LISTBOX_SEL_NUM:
{
int idx;
idx = m_listbox->GetSelection();
- m_listbox->Delete( idx );
+ if ( idx != wxNOT_FOUND )
+ m_listbox->Delete( idx );
idx = m_listboxSorted->GetSelection();
- m_listboxSorted->Delete( idx );
+ if ( idx != wxNOT_FOUND )
+ m_listboxSorted->Delete( idx );
break;
}
case ID_LISTBOX_FONT:
}
}
+#if wxUSE_CHOICE
void MyPanel::OnChoice( wxCommandEvent &event )
{
wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
case ID_CHOICE_DELETE:
{
int idx = m_choice->GetSelection();
- m_choice->Delete( idx );
+ if ( idx != wxNOT_FOUND )
+ m_choice->Delete( idx );
idx = m_choiceSorted->GetSelection();
- m_choiceSorted->Delete( idx );
+ if ( idx != wxNOT_FOUND )
+ m_choiceSorted->Delete( idx );
break;
}
case ID_CHOICE_FONT:
}
}
}
+#endif // wxUSE_CHOICE
void MyPanel::OnCombo( wxCommandEvent &event )
{
m_text->AppendText( "\n" );
}
+void MyPanel::OnComboTextChanged(wxCommandEvent& WXUNUSED(event))
+{
+ wxLogMessage(_T("Text in the combobox changed: now is '%s'."),
+ m_combo->GetValue().c_str());
+}
+
+void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event))
+{
+ wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."),
+ m_combo->GetValue().c_str());
+}
+
void MyPanel::OnComboButtons( wxCommandEvent &event )
{
switch (event.GetId())
m_text->SetFont( *wxITALIC_FONT );
}
-void MyPanel::OnUpdateLabel( wxCommandEvent &WXUNUSED(event) )
+void MyPanel::OnUpdateLabel( wxCommandEvent &event )
{
- static bool s_long = TRUE;
-
- s_long = !s_long;
- m_label->SetLabel(s_long ? "very very very long text" : "shorter text");
+ m_label->SetLabel(event.GetInt() ? "Very very very very very long text."
+ : "Shorter text.");
}
void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
{
m_gauge->SetValue( m_slider->GetValue() );
+ m_gaugeVert->SetValue( m_slider->GetValue() / 2 );
}
#if wxUSE_SPINCTRL
void MyPanel::OnSpinCtrl(wxSpinEvent& event)
{
wxString s;
- s.Printf(_T("Current value of spin ctrl is %d\n"), m_spinctrl->GetValue());
+ s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
+ m_spinctrl->GetValue(), event.GetInt());
m_text->AppendText(s);
}
max, // range
this, // parent
wxPD_CAN_ABORT |
+ wxPD_AUTO_HIDE |
wxPD_APP_MODAL |
wxPD_ELAPSED_TIME |
wxPD_ESTIMATED_TIME |
bool cont = TRUE;
- for ( int i = 0; i < max && cont; i++ )
+ for ( int i = 0; i <= max && cont; i++ )
{
wxSleep(1);
- if ( i == max - 1 )
+ if ( i == max )
{
cont = dialog.Update(i, "That's all, folks!");
}
else if ( i == max / 2 )
{
- cont = dialog.Update(i, "Only a half left!");
+ cont = dialog.Update(i, "Only a half left (very long message)!");
}
else
{
MyPanel::~MyPanel()
{
+ //wxLog::RemoveTraceMask(_T("focus"));
+ delete wxLog::SetActiveTarget(m_logTargetOld);
+
delete m_notebook->GetImageList();
}
//----------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
- EVT_MENU(MINIMAL_QUIT, MyFrame::OnQuit)
- EVT_MENU(MINIMAL_ABOUT, MyFrame::OnAbout)
+ EVT_MENU(CONTROLS_QUIT, MyFrame::OnQuit)
+ EVT_MENU(CONTROLS_ABOUT, MyFrame::OnAbout)
+ EVT_MENU(CONTROLS_CLEAR_LOG, MyFrame::OnClearLog)
#if wxUSE_TOOLTIPS
- EVT_MENU(MINIMAL_SET_TOOLTIP_DELAY, MyFrame::OnSetTooltipDelay)
- EVT_MENU(MINIMAL_ENABLE_TOOLTIPS, MyFrame::OnToggleTooltips)
+ EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY, MyFrame::OnSetTooltipDelay)
+ EVT_MENU(CONTROLS_ENABLE_TOOLTIPS, MyFrame::OnToggleTooltips)
#endif // wxUSE_TOOLTIPS
- EVT_MENU(MINIMAL_ENABLE_ALL, MyFrame::OnEnableAll)
+ EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll)
EVT_SIZE(MyFrame::OnSize)
EVT_MOVE(MyFrame::OnMove)
EVT_IDLE(MyFrame::OnIdle)
END_EVENT_TABLE()
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
-: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+MyFrame::MyFrame(const char *title, int x, int y)
+ : wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(500, 430))
{
+ // Give it an icon
+ // The wxICON() macros loads an icon from a resource under Windows
+ // and uses an #included XPM image under GTK+ and Motif
+
+ SetIcon( wxICON(mondrian) );
+
+ wxMenu *file_menu = new wxMenu;
+
+ file_menu->Append(CONTROLS_CLEAR_LOG, "&Clear log\tCtrl-L");
+ file_menu->AppendSeparator();
+ file_menu->Append(CONTROLS_ABOUT, "&About\tF1");
+ file_menu->AppendSeparator();
+ file_menu->Append(CONTROLS_QUIT, "E&xit\tAlt-X", "Quit controls sample");
+
+ wxMenuBar *menu_bar = new wxMenuBar;
+ menu_bar->Append(file_menu, "&File");
+
+#if wxUSE_TOOLTIPS
+ wxMenu *tooltip_menu = new wxMenu;
+ tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");
+ tooltip_menu->AppendSeparator();
+ tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T",
+ "enable/disable tooltips", TRUE);
+ tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE);
+ menu_bar->Append(tooltip_menu, "&Tooltips");
+#endif // wxUSE_TOOLTIPS
+
+ wxMenu *panel_menu = new wxMenu;
+ panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E",
+ "Enable/disable all panel controls", TRUE);
+ menu_bar->Append(panel_menu, "&Panel");
+
+ SetMenuBar(menu_bar);
+
CreateStatusBar(2);
m_panel = new MyPanel( this, 10, 10, 300, 100 );
+
+ SetSizeHints( 500, 425 );
}
void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
- wxBeginBusyCursor();
+ wxBusyCursor bc;
wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
dialog.ShowModal();
+}
- wxEndBusyCursor();
+void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
+{
+ m_panel->m_text->Clear();
}
#if wxUSE_TOOLTIPS
wxString msg;
msg.Printf(
#ifdef __WXMSW__
- _T("Focus: wxWindow = %p, HWND = %08x"),
+ _T("Focus: %s, HWND = %08x"),
#else
- _T("Focus: wxWindow = %p"),
+ _T("Focus: %s"),
#endif
- s_windowFocus
+ s_windowFocus->GetClassInfo()->GetClassName()
#ifdef __WXMSW__
, s_windowFocus->GetHWND()
#endif
}
}
-static void SetControlClientData(const char *name,
- wxControlWithItems *control)
+void MyComboBox::OnChar(wxKeyEvent& event)
+{
+ wxLogMessage(_T("MyComboBox::OnChar"));
+
+ if ( event.KeyCode() == 'w' )
+ wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
+ else
+ event.Skip();
+}
+
+void MyComboBox::OnKeyDown(wxKeyEvent& event)
+{
+ wxLogMessage(_T("MyComboBox::OnKeyDown"));
+
+ if ( event.KeyCode() == 'w' )
+ wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
+ else
+ event.Skip();
+}
+
+void MyComboBox::OnKeyUp(wxKeyEvent& event)
+{
+ wxLogMessage(_T("MyComboBox::OnKeyUp"));
+
+ event.Skip();
+}
+
+static void SetListboxClientData(const wxChar *name, wxListBox *control)
+{
+ size_t count = control->GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ wxString s;
+ s.Printf(wxT("%s client data for '%s'"),
+ name, control->GetString(n).c_str());
+
+ control->SetClientObject(n, new wxStringClientData(s));
+ }
+}
+
+static void SetChoiceClientData(const wxChar *name, wxChoice *control)
{
size_t count = control->GetCount();
for ( size_t n = 0; n < count; n++ )
{
wxString s;
- s.Printf("%s client data for '%s'",
+ s.Printf(wxT("%s client data for '%s'"),
name, control->GetString(n).c_str());
control->SetClientObject(n, new wxStringClientData(s));
projects / wxWidgets.git / blobdiff