// Modified by:
// RCS-ID: $Id$
// Copyright: (c) Robert Roebling, Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/imaglist.h"
#include "wx/artprov.h"
#include "wx/cshelp.h"
+#include "wx/gbsizer.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif // __WXMSW__
#endif // wxUSE_TOOLTIPS
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
- #define USE_XPM
-#endif
-
-#ifdef USE_XPM
- #include "mondrian.xpm"
+#ifndef __WXMSW__
#include "icons/choice.xpm"
#include "icons/combo.xpm"
#include "icons/list.xpm"
#define EVT_TOGGLEBUTTON EVT_CHECKBOX
#endif
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+ #include "../sample.xpm"
+#endif
+
//----------------------------------------------------------------------
// class definitions
//----------------------------------------------------------------------
void OnDClick(wxMouseEvent& event)
{
- wxLogMessage(_T("MyButton::OnDClick"));
+ wxLogMessage(wxT("MyButton::OnDClick"));
event.Skip();
}
void OnKeyUp(wxKeyEvent& event);
void OnFocusGot(wxFocusEvent& event)
{
- wxLogMessage(_T("MyComboBox::OnFocusGot"));
+ wxLogMessage(wxT("MyComboBox::OnFocusGot"));
event.Skip();
}
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
int majorDim = 1,
- long style = wxRA_HORIZONTAL,
+ long style = wxRA_SPECIFY_COLS,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr)
: wxRadioBox(parent, id, title, pos, size, n, choices, majorDim,
protected:
void OnFocusGot(wxFocusEvent& event)
{
- wxLogMessage(_T("MyRadioBox::OnFocusGot"));
+ wxLogMessage(wxT("MyRadioBox::OnFocusGot"));
event.Skip();
}
void OnFocusLost(wxFocusEvent& event)
{
- wxLogMessage(_T("MyRadioBox::OnFocusLost"));
+ wxLogMessage(wxT("MyRadioBox::OnFocusLost"));
event.Skip();
}
protected:
void OnFocusGot(wxFocusEvent& event)
{
- wxLogMessage(_T("MyChoice::OnFocusGot"));
+ wxLogMessage(wxT("MyChoice::OnFocusGot"));
event.Skip();
}
void OnFocusLost(wxFocusEvent& event)
{
- wxLogMessage(_T("MyChoice::OnFocusLost"));
+ wxLogMessage(wxT("MyChoice::OnFocusLost"));
event.Skip();
}
#endif // wxUSE_HELP
// Create the main frame window
- MyFrame *frame = new MyFrame(_T("Controls wxWidgets App"), x, y);
+ MyFrame *frame = new MyFrame(wxT("Controls wxWidgets App"), x, y);
frame->Show(true);
return true;
m_book = NULL;
m_label = NULL;
- m_text = new wxTextCtrl(this, wxID_ANY, _T("This is the log window.\n"),
+ m_text = new wxTextCtrl(this, wxID_ANY, wxT("This is the log window.\n"),
wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
wxString choices[] =
{
- _T("This"),
- _T("is"),
- _T("one of my long and"),
- _T("wonderful"),
- _T("examples.")
+ wxT("This"),
+ wxT("is"),
+ wxT("one of my long and"),
+ wxT("wonderful"),
+ wxT("examples.")
};
-#ifdef USE_XPM
+#ifndef __WXMSW__
// image ids
enum
{
imagelist-> Add( wxBitmap( gauge_xpm ));
#endif // wxUSE_GAUGE
m_book->SetImageList(imagelist);
-#elif defined(__WXMSW__)
+#else
// load images from resources
enum
{
static const wxChar *s_iconNames[Image_Max] =
{
- _T("list")
- , _T("choice")
- , _T("combo")
- , _T("text")
- , _T("radio")
+ wxT("list")
+ , wxT("choice")
+ , wxT("combo")
+ , wxT("text")
+ , wxT("radio")
#if wxUSE_GAUGE
- , _T("gauge")
+ , wxT("gauge")
#endif // wxUSE_GAUGE
};
for ( size_t n = 0; n < Image_Max; n++ )
{
wxBitmap bmp(s_iconNames[n]);
- if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
+ if ( !bmp.IsOk() || (imagelist->Add(bmp) == -1) )
{
wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."),
s_iconNames[n], n);
}
m_book->SetImageList(imagelist);
-#else
-
- // No images for now
-#define Image_List -1
-#define Image_Choice -1
-#define Image_Combo -1
-#define Image_Text -1
-#define Image_Radio -1
-#if wxUSE_GAUGE
-#define Image_Gauge -1
-#endif // wxUSE_GAUGE
-#define Image_Max -1
-
#endif
+ // ------------------------------------------------------------------------
+ // listbox page
+ // ------------------------------------------------------------------------
wxPanel *panel = new wxPanel(m_book);
m_listbox = new wxListBox( panel, ID_LISTBOX,
wxPoint(10,10), wxSize(120,70),
m_listbox->SetCursor(*wxCROSS_CURSOR);
- m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
- m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_LISTBOX_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
- (void)new MyButton( panel, ID_LISTBOX_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_LISTBOX_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
- wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
+ m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, wxT("Select #&2"), wxPoint(180,30), wxSize(140,30) );
+ m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, wxT("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_LISTBOX_CLEAR, wxT("&Clear"), wxPoint(180,80), wxSize(140,30) );
+ (void)new MyButton( panel, ID_LISTBOX_APPEND, wxT("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_LISTBOX_DELETE, wxT("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
+ wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, wxT("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
button->SetDefault();
- m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) );
+ m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, wxT("&Disable"), wxPoint(20,170) );
m_checkbox->SetValue(false);
button->MoveAfterInTabOrder(m_checkbox);
- (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),
+ (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, wxT("&Toggle colour"),
wxPoint(110,170) );
panel->SetCursor(wxCursor(wxCURSOR_HAND));
- m_book->AddPage(panel, _T("wxListBox"), true, Image_List);
+ m_book->AddPage(panel, wxT("wxListBox"), true, Image_List);
+ // ------------------------------------------------------------------------
+ // choice page
+ // ------------------------------------------------------------------------
#if wxUSE_CHOICE
panel = new wxPanel(m_book);
- m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices );
+ m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxDefaultSize, 5, choices );
m_choiceSorted = new MyChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),
5, choices, wxCB_SORT );
SetChoiceClientData(wxT("choice"), m_choiceSorted);
m_choice->SetSelection(2);
- (void)new wxButton( panel, ID_CHOICE_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
- (void)new wxButton( panel, ID_CHOICE_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
- (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
-
- m_book->AddPage(panel, _T("wxChoice"), false, Image_Choice);
+ (void)new wxButton( panel, ID_CHOICE_SEL_NUM, wxT("Select #&2"), wxPoint(220,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_SEL_STR, wxT("&Select 'This'"), wxPoint(380,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_CLEAR, wxT("&Clear"), wxPoint(220,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_APPEND, wxT("&Append 'Hi!'"), wxPoint(380,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_DELETE, wxT("D&elete selected item"), wxPoint(220,130), wxSize(140,30) );
+ (void)new wxButton( panel, ID_CHOICE_FONT, wxT("Set &Italic font"), wxPoint(380,130), wxSize(140,30) );
+ (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
+
+ m_book->AddPage(panel, wxT("wxChoice"), false, Image_Choice);
#endif // wxUSE_CHOICE
+ // ------------------------------------------------------------------------
+ // combo page
+ // ------------------------------------------------------------------------
panel = new wxPanel(m_book);
- (void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"),
- wxPoint(5, 5), wxSize(150, 100));
- m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),
- wxPoint(20,25), wxSize(120, wxDefaultCoord),
+ m_combo = new MyComboBox( panel, ID_COMBO, wxT("This"),
+ wxPoint(15,25), wxDefaultSize,
5, choices,
wxTE_PROCESS_ENTER);
-
- (void)new wxButton( panel, ID_COMBO_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
- (void)new wxButton( panel, ID_COMBO_SET_TEXT, _T("Set 'Hi!' at #2"), wxPoint(340,180), wxSize(140,30) );
- (void)new wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
- m_book->AddPage(panel, _T("wxComboBox"), false, Image_Combo);
-
+ wxSize combosize(m_combo->GetBestSize().x + 20, 100);
+ (void)new wxStaticBox( panel, wxID_ANY, wxT("&Box around combobox"),
+ wxPoint(5, 5), combosize);
+
+ (void)new wxButton( panel, ID_COMBO_SEL_NUM, wxT("Select #&2"), wxPoint(220,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_SEL_STR, wxT("&Select 'This'"), wxPoint(380,30), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_CLEAR, wxT("&Clear"), wxPoint(220,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_APPEND, wxT("&Append 'Hi!'"), wxPoint(380,80), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_DELETE, wxT("D&elete selected item"), wxPoint(220,130), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_FONT, wxT("Set &Italic font"), wxPoint(380,130), wxSize(140,30) );
+ (void)new wxButton( panel, ID_COMBO_SET_TEXT, wxT("Set 'Hi!' at #2"), wxPoint(380,180), wxSize(140,30) );
+ (void)new wxCheckBox( panel, ID_COMBO_ENABLE, wxT("&Disable"), wxPoint(20,130), wxSize(140,30) );
+ m_book->AddPage(panel, wxT("wxComboBox"), false, Image_Combo);
+
+ // ------------------------------------------------------------------------
+ // radio box
+ // ------------------------------------------------------------------------
wxString choices2[] =
{
- _T("First"), _T("Second"),
+ wxT("First"), wxT("Second"),
/* "Third",
"Fourth", "Fifth", "Sixth",
"Seventh", "Eighth", "Nineth", "Tenth" */
};
panel = new wxPanel(m_book);
- new MyRadioBox(panel, ID_RADIOBOX2, _T("&That"),
- wxPoint(10,160), wxDefaultSize,
- WXSIZEOF(choices2), choices2,
- 1, wxRA_SPECIFY_ROWS );
- m_radio = new wxRadioBox(panel, ID_RADIOBOX, _T("T&his"),
+ wxGridBagSizer* radio_page_sizer = new wxGridBagSizer(5, 5);
+
+ m_radio = new wxRadioBox(panel, ID_RADIOBOX, wxT("T&his"),
wxPoint(10,10), wxDefaultSize,
WXSIZEOF(choices), choices,
1, wxRA_SPECIFY_COLS );
+ MyRadioBox* mybox = new MyRadioBox(panel, ID_RADIOBOX2, wxT("&That"),
+ wxPoint(10,160), wxDefaultSize,
+ WXSIZEOF(choices2), choices2,
+ 1, wxRA_SPECIFY_ROWS );
+
+ radio_page_sizer->Add( m_radio, wxGBPosition(0,0), wxGBSpan(2,1) );
+ radio_page_sizer->Add( mybox, wxGBPosition(2,0), wxGBSpan(2,1) );
#if wxUSE_HELP
- for( unsigned int item = 0; item < WXSIZEOF(choices); ++item )
- m_radio->SetItemHelpText( item, wxString::Format( _T("Help text for \"%s\""), choices[item].c_str() ) );
+ for (unsigned int item = 0; item < WXSIZEOF(choices); ++item)
+ m_radio->SetItemHelpText( item, wxString::Format( wxT("Help text for \"%s\""),
+ choices[item].c_str() ) );
// erase help text for the second item
- m_radio->SetItemHelpText( 1, _T("") );
+ m_radio->SetItemHelpText( 1, wxT("") );
// set default help text for control
- m_radio->SetHelpText( _T("Default helptext for wxRadioBox") );
+ m_radio->SetHelpText( wxT("Default helptext for wxRadioBox") );
#endif // wxUSE_HELP
- (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, _T("&Select 'This'"), wxPoint(180,80), wxSize(140,30) );
- m_fontButton = new wxButton( panel, ID_SET_FONT, _T("Set &more Italic font"), wxPoint(340,30), wxSize(140,30) );
- (void)new wxButton( panel, ID_RADIOBOX_FONT, _T("Set &Italic font"), wxPoint(340,80), wxSize(140,30) );
- (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, _T("&Disable"), wxPoint(340,130), wxDefaultSize );
-
- wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
+ wxButton* select_two = new wxButton ( panel, ID_RADIOBOX_SEL_NUM, wxT("Select #&2") );
+ wxButton* select_this = new wxButton ( panel, ID_RADIOBOX_SEL_STR, wxT("&Select 'This'") );
+ m_fontButton = new wxButton ( panel, ID_SET_FONT, wxT("Set &more Italic font") );
+ wxButton* set_italic = new wxButton ( panel, ID_RADIOBOX_FONT, wxT("Set &Italic font") );
+ wxCheckBox* disable_cb = new wxCheckBox( panel, ID_RADIOBOX_ENABLE, wxT("&Disable") );
+ wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, wxT("Radiobutton1"),
+ wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+ wxRadioButton *rb2 = new wxRadioButton( panel, ID_RADIOBUTTON_2, wxT("&Radiobutton2"),
+ wxDefaultPosition, wxDefaultSize );
rb->SetValue( false );
- (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );
- m_book->AddPage(panel, _T("wxRadioBox"), false, Image_Radio);
+ radio_page_sizer->Add( select_two, wxGBPosition(0, 1), wxDefaultSpan, wxALL , 10 );
+ radio_page_sizer->Add( select_this, wxGBPosition(1, 1), wxDefaultSpan, wxALL , 10 );
+ radio_page_sizer->Add( m_fontButton, wxGBPosition(0, 2), wxDefaultSpan, wxALL , 10 );
+ radio_page_sizer->Add( set_italic, wxGBPosition(1, 2), wxDefaultSpan, wxALL , 10 );
+ radio_page_sizer->Add( disable_cb, wxGBPosition(2, 2), wxDefaultSpan, wxLEFT | wxRIGHT, 10 );
+ radio_page_sizer->Add( rb, wxGBPosition(3, 1), wxDefaultSpan, wxLEFT | wxRIGHT, 10 );
+ radio_page_sizer->Add( rb2, wxGBPosition(3, 2), wxDefaultSpan, wxLEFT | wxRIGHT, 10 );
+
+ panel->SetSizer( radio_page_sizer );
+
+ m_book->AddPage(panel, wxT("wxRadioBox"), false, Image_Radio);
+
+ // ------------------------------------------------------------------------
+ // gauge and slider
+ // ------------------------------------------------------------------------
#if wxUSE_SLIDER && wxUSE_GAUGE
panel = new wxPanel(m_book);
- wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );
- panel->SetSizer( main_sizer );
+ wxBoxSizer *gauge_page_vsizer = new wxBoxSizer( wxVERTICAL );
- wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, _T("&wxGauge and wxSlider") );
- main_sizer->Add( gauge_sizer, 0, wxALL, 5 );
+ wxBoxSizer *gauge_page_first_row_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+ wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, wxT("&wxGauge and wxSlider") );
+ gauge_page_first_row_sizer->Add( gauge_sizer, 0, wxALL, 5 );
wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL );
gauge_sizer->Add( sz );
m_gauge = new wxGauge( panel, wxID_ANY, 200, wxDefaultPosition, wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200,
wxDefaultPosition, wxSize(155,wxDefaultCoord),
wxSL_AUTOTICKS | wxSL_LABELS);
- m_slider->SetTickFreq(40, 0);
+ m_slider->SetTickFreq(40);
sz->Add( m_slider, 0, wxALL, 10 );
m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
- wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, _T("&Explanation"),
+ wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, wxT("&Explanation"),
wxDefaultPosition, wxDefaultSize ); //, wxALIGN_CENTER );
wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL );
- main_sizer->Add( wrapping_sizer, 0, wxALL, 5 );
+ gauge_page_first_row_sizer->Add( wrapping_sizer, 0, wxALL, 5 );
#ifdef __WXMOTIF__
// No wrapping text in wxStaticText yet :-(
m_wrappingText = new wxStaticText( panel, wxID_ANY,
- _T("Drag the slider!"),
+ wxT("Drag the slider!"),
wxPoint(250,30),
wxSize(240, wxDefaultCoord)
);
#else
m_wrappingText = new wxStaticText( panel, wxID_ANY,
- _T("In order see the gauge (aka progress bar) ")
- _T("control do something you have to drag the ")
- _T("handle of the slider to the right.")
- _T("\n\n")
- _T("This is also supposed to demonstrate how ")
- _T("to use static controls with line wrapping."),
+ wxT("In order see the gauge (aka progress bar) ")
+ wxT("control do something you have to drag the ")
+ wxT("handle of the slider to the right.")
+ wxT("\n\n")
+ wxT("This is also supposed to demonstrate how ")
+ wxT("to use static controls with line wrapping."),
wxDefaultPosition,
wxSize(240, wxDefaultCoord)
);
wrapping_sizer->Add( m_wrappingText );
wxStaticBoxSizer *non_wrapping_sizer = new wxStaticBoxSizer( wxVERTICAL, panel, wxT("Non-wrapping") );
- main_sizer->Add( non_wrapping_sizer, 0, wxALL, 5 );
+ gauge_page_first_row_sizer->Add( non_wrapping_sizer, 0, wxALL, 5 );
m_nonWrappingText = new wxStaticText( panel, wxID_ANY,
- _T("This static text has two lines.\nThey do not wrap."),
+ wxT("This static text has two lines.\nThey do not wrap."),
wxDefaultPosition,
wxDefaultSize
);
non_wrapping_sizer->Add( m_nonWrappingText );
- (void)new wxButton( panel, ID_BTNNEWTEXT, wxT("New text"), wxPoint(450, 160) );
+ gauge_page_vsizer->Add( gauge_page_first_row_sizer, 1 );
+ wxBoxSizer *gauge_page_second_row_sizer = new wxBoxSizer( wxHORIZONTAL );
+
int initialSpinValue = -5;
wxString s;
s << initialSpinValue;
- m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );
+ m_spintext = new wxTextCtrl( panel, wxID_ANY, s );
+ gauge_page_second_row_sizer->Add( m_spintext, 0, wxALL, 5 );
+
#if wxUSE_SPINBTN
- m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(-1, m_spintext->GetSize().y) );
+ m_spinbutton = new wxSpinButton( panel, ID_SPIN );
m_spinbutton->SetRange(-40,30);
m_spinbutton->SetValue(initialSpinValue);
-
-#if wxUSE_PROGRESSDLG
- m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, _T("&Show progress dialog"),
- wxPoint(300, 160) );
-#endif // wxUSE_PROGRESSDLG
+ gauge_page_second_row_sizer->Add( m_spinbutton, 0, wxALL, 5 );
#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
- m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString, wxPoint(200, 160), wxSize(80, wxDefaultCoord) );
+ m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, wxEmptyString );
m_spinctrl->SetRange(-10,30);
m_spinctrl->SetValue(15);
+ gauge_page_second_row_sizer->Add( m_spinctrl, 0, wxALL, 5 );
#endif // wxUSE_SPINCTRL
- m_book->AddPage(panel, _T("wxGauge"), false, Image_Gauge);
+#if wxUSE_SPINBTN
+#if wxUSE_PROGRESSDLG
+ m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, wxT("&Show progress dialog") );
+ gauge_page_second_row_sizer->Add( m_btnProgress, 0, wxALL, 5 );
+#endif // wxUSE_PROGRESSDLG
+#endif // wxUSE_SPINBTN
+
+ wxButton* newTextButton = new wxButton( panel, ID_BTNNEWTEXT, wxT("New text"));
+ gauge_page_second_row_sizer->Add( newTextButton, 0, wxALL, 5 );
+
+ gauge_page_vsizer->Add(gauge_page_second_row_sizer, 1);
+ panel->SetSizer( gauge_page_vsizer );
+
+ m_book->AddPage(panel, wxT("wxGauge"), false, Image_Gauge);
#endif // wxUSE_SLIDER && wxUSE_GAUGE
+ // ------------------------------------------------------------------------
+ // wxBitmapXXX
+ // ------------------------------------------------------------------------
+
panel = new wxPanel(m_book);
#if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet.
dc.SetPen(*wxRED_PEN);
dc.Clear();
dc.DrawEllipse(5, 5, 90, 90);
- dc.DrawText(_T("Bitmap"), 30, 40);
+ dc.DrawText(wxT("Bitmap"), 30, 40);
dc.SelectObject( wxNullBitmap );
- (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
- (void)new wxToggleButton(panel, ID_BITMAP_BTN_ENABLE,
- _T("Enable/disable &bitmap"), wxPoint(100, 140));
+ wxPanel *panel2 = new wxPanel(panel, -1, wxPoint(100, 0), wxSize(100, 200));
+ (void)new wxBitmapButton(panel2, ID_BITMAP_BTN, bitmap, wxPoint(0, 20));
+ (void)new wxToggleButton(panel2, ID_BITMAP_BTN_ENABLE,
+ wxT("Enable/disable &bitmap"), wxPoint(0, 140));
#if defined(__WXMSW__) || defined(__WXMOTIF__)
// test for masked bitmap display
- bitmap = wxBitmap(_T("test2.bmp"), wxBITMAP_TYPE_BMP);
- if (bitmap.Ok())
+ bitmap = wxBitmap(wxT("test2.bmp"), wxBITMAP_TYPE_BMP);
+ if (bitmap.IsOk())
{
bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
bmpBtn->SetBitmapFocus(bmp3);
(void)new wxToggleButton(panel, ID_BUTTON_LABEL,
- _T("&Toggle label"), wxPoint(250, 20));
+ wxT("&Toggle label"), wxPoint(250, 20));
- m_label = new wxStaticText(panel, wxID_ANY, _T("Label with some long text"),
+ m_label = new wxStaticText(panel, wxID_ANY, wxT("Label with some long text"),
wxPoint(250, 60), wxDefaultSize,
wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
m_label->SetForegroundColour( *wxBLUE );
- m_book->AddPage(panel, _T("wxBitmapXXX"));
+ m_book->AddPage(panel, wxT("wxBitmapXXX"));
+
+ // ------------------------------------------------------------------------
+ // sizer page
+ // ------------------------------------------------------------------------
- // sizer
panel = new wxPanel(m_book);
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer *csizer =
- new wxStaticBoxSizer (new wxStaticBox (panel, wxID_ANY, _T("Show Buttons")), wxHORIZONTAL );
+ new wxStaticBoxSizer (new wxStaticBox (panel, wxID_ANY, wxT("Show Buttons")), wxHORIZONTAL );
wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig;
- check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, _T("1"));
+ check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, wxT("1"));
check1->SetValue (true);
csizer->Add (check1);
- check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, _T("2"));
+ check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, wxT("2"));
check2->SetValue (true);
csizer->Add (check2);
- check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, _T("3"));
+ check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, wxT("3"));
check3->SetValue (true);
csizer->Add (check3);
- check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, _T("4"));
+ check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, wxT("4"));
check4->SetValue (true);
csizer->Add (check4);
- check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, _T("1-4"));
+ check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, wxT("1-4"));
check14->SetValue (true);
csizer->Add (check14);
- checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big"));
+ checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, wxT("Big"));
checkBig->SetValue (true);
csizer->Add (checkBig);
m_buttonSizer = new wxBoxSizer (wxVERTICAL);
- m_sizerBtn1 = new wxButton(panel, wxID_ANY, _T("Test Button &1 (tab order 1)") );
+ m_sizerBtn1 = new wxButton(panel, wxID_ANY, wxT("Test Button &1 (tab order 1)") );
m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 );
- m_sizerBtn2 = new wxButton(panel, wxID_ANY, _T("Test Button &2 (tab order 3)") );
+ m_sizerBtn2 = new wxButton(panel, wxID_ANY, wxT("Test Button &2 (tab order 3)") );
m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 );
- m_sizerBtn3 = new wxButton(panel, wxID_ANY, _T("Test Button &3 (tab order 2)") );
+ m_sizerBtn3 = new wxButton(panel, wxID_ANY, wxT("Test Button &3 (tab order 2)") );
m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 );
- m_sizerBtn4 = new wxButton(panel, wxID_ANY, _T("Test Button &4 (tab order 4)") );
+ m_sizerBtn4 = new wxButton(panel, wxID_ANY, wxT("Test Button &4 (tab order 4)") );
m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 );
m_sizerBtn3->MoveBeforeInTabOrder(m_sizerBtn2);
m_hsizer->Add (m_buttonSizer);
m_hsizer->Add( 20,20, 1 );
- m_bigBtn = new wxButton(panel, wxID_ANY, _T("Multiline\nbutton") );
+ m_bigBtn = new wxButton(panel, wxID_ANY, wxT("Multiline\nbutton") );
m_hsizer->Add( m_bigBtn , 3, wxGROW|wxALL, 10 );
sizer->Add (m_hsizer, 1, wxGROW);
panel->SetSizer( sizer );
- m_book->AddPage(panel, _T("wxSizer"));
+ m_book->AddPage(panel, wxT("wxSizer"));
// set the sizer for the panel itself
sizer = new wxBoxSizer(wxVERTICAL);
{
if ( s_selCombo != INVALID_SELECTION )
{
- wxLogMessage(_T("EVT_IDLE: combobox selection changed from %d to %d"),
+ wxLogMessage(wxT("EVT_IDLE: combobox selection changed from %d to %d"),
s_selCombo, sel);
}
{
if ( s_selChoice != INVALID_SELECTION )
{
- wxLogMessage(_T("EVT_IDLE: choice selection changed from %d to %d"),
+ wxLogMessage(wxT("EVT_IDLE: choice selection changed from %d to %d"),
s_selChoice, sel);
}
int selOld = event.GetOldSelection();
if ( selOld == 2 )
{
- if ( wxMessageBox(_T("This demonstrates how a program may prevent the\n")
- _T("page change from taking place - if you select\n")
- _T("[No] the current page will stay the third one\n"),
- _T("Control sample"),
+ if ( wxMessageBox(wxT("This demonstrates how a program may prevent the\n")
+ wxT("page change from taking place - if you select\n")
+ wxT("[No] the current page will stay the third one\n"),
+ wxT("Control sample"),
wxICON_QUESTION | wxYES_NO, this) != wxYES )
{
event.Veto();
}
}
- *m_text << _T("Book selection is being changed from ") << selOld
- << _T(" to ") << event.GetSelection()
- << _T(" (current page from book is ")
- << m_book->GetSelection() << _T(")\n");
+ *m_text << wxT("Book selection is being changed from ") << selOld
+ << wxT(" to ") << event.GetSelection()
+ << wxT(" (current page from book is ")
+ << m_book->GetSelection() << wxT(")\n");
}
void MyPanel::OnPageChanged( wxBookCtrlEvent &event )
{
- *m_text << _T("Book selection is now ") << event.GetSelection()
- << _T(" (from book: ") << m_book->GetSelection()
- << _T(")\n");
+ *m_text << wxT("Book selection is now ") << event.GetSelection()
+ << wxT(" (from book: ") << m_book->GetSelection()
+ << wxT(")\n");
}
void MyPanel::OnTestButton(wxCommandEvent& event)
{
- wxLogMessage(_T("Button %c clicked."),
- event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2'));
+ wxLogMessage(wxT("Button %c clicked."),
+ event.GetId() == ID_BUTTON_TEST1 ? wxT('1') : wxT('2'));
}
void MyPanel::OnBmpButton(wxCommandEvent& WXUNUSED(event))
{
- wxLogMessage(_T("Bitmap button clicked."));
+ wxLogMessage(wxT("Bitmap button clicked."));
}
void MyPanel::OnBmpButtonToggle(wxCommandEvent& event)
SetThemeEnabled(false);
// test panel colour changing and propagation to the subcontrols
- if ( s_colOld.Ok() )
+ if ( s_colOld.IsOk() )
{
SetBackgroundColour(s_colOld);
s_colOld = wxNullColour;
{
deselect = !event.IsSelection();
if (deselect)
- m_text->AppendText( _T("ListBox deselection event\n") );
+ m_text->AppendText( wxT("ListBox deselection event\n") );
}
- m_text->AppendText( _T("ListBox event selection string is: '") );
+ m_text->AppendText( wxT("ListBox event selection string is: '") );
m_text->AppendText( event.GetString() );
- m_text->AppendText( _T("'\n") );
+ m_text->AppendText( wxT("'\n") );
// can't use GetStringSelection() with multiple selections, there could be
// more than one of them
if ( !listbox->HasFlag(wxLB_MULTIPLE) && !listbox->HasFlag(wxLB_EXTENDED) )
{
- m_text->AppendText( _T("ListBox control selection string is: '") );
+ m_text->AppendText( wxT("ListBox control selection string is: '") );
m_text->AppendText( listbox->GetStringSelection() );
- m_text->AppendText( _T("'\n") );
+ m_text->AppendText( wxT("'\n") );
}
wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
- m_text->AppendText( _T("ListBox event client data string is: '") );
+ m_text->AppendText( wxT("ListBox event client data string is: '") );
if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
m_text->AppendText( obj->GetData() );
else
- m_text->AppendText( wxString(_T("none")) );
+ m_text->AppendText( wxString(wxT("none")) );
- m_text->AppendText( _T("'\n") );
- m_text->AppendText( _T("ListBox control client data string is: '") );
+ m_text->AppendText( wxT("'\n") );
+ m_text->AppendText( wxT("ListBox control client data string is: '") );
obj = (wxStringClientData *)listbox->GetClientObject(event.GetInt());
if (obj)
m_text->AppendText( obj->GetData() );
else
- m_text->AppendText( wxString(_T("none")) );
- m_text->AppendText( _T("'\n") );
+ m_text->AppendText( wxString(wxT("none")) );
+ m_text->AppendText( wxT("'\n") );
}
void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
{
- m_text->AppendText( _T("ListBox double click string is: ") );
+ m_text->AppendText( wxT("ListBox double click string is: ") );
m_text->AppendText( event.GetString() );
- m_text->AppendText( _T("\n") );
+ m_text->AppendText( wxT("\n") );
}
void MyPanel::OnListBoxButtons( wxCommandEvent &event )
{
case ID_LISTBOX_ENABLE:
{
- m_text->AppendText(_T("Checkbox clicked.\n"));
+ m_text->AppendText(wxT("Checkbox clicked.\n"));
#if wxUSE_TOOLTIPS
wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
if (event.GetInt())
- cb->SetToolTip( _T("Click to enable listbox") );
+ cb->SetToolTip( wxT("Click to enable listbox") );
else
- cb->SetToolTip( _T("Click to disable listbox") );
+ cb->SetToolTip( wxT("Click to disable listbox") );
#endif // wxUSE_TOOLTIPS
m_listbox->Enable( event.GetInt() == 0 );
m_lbSelectThis->Enable( event.GetInt() == 0 );
}
case ID_LISTBOX_SEL_STR:
{
- if (m_listbox->FindString(_T("This")) != wxNOT_FOUND)
- m_listbox->SetStringSelection( _T("This") );
- if (m_listboxSorted->FindString(_T("This")) != wxNOT_FOUND)
- m_listboxSorted->SetStringSelection( _T("This") );
+ if (m_listbox->FindString(wxT("This")) != wxNOT_FOUND)
+ m_listbox->SetStringSelection( wxT("This") );
+ if (m_listboxSorted->FindString(wxT("This")) != wxNOT_FOUND)
+ m_listboxSorted->SetStringSelection( wxT("This") );
m_lbSelectNum->WarpPointer( 40, 14 );
break;
}
}
case ID_LISTBOX_APPEND:
{
- m_listbox->Append( _T("Hi kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk!") );
- m_listboxSorted->Append( _T("Hi hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh!") );
+ m_listbox->Append( wxT("Hi kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk!") );
+ m_listboxSorted->Append( wxT("Hi hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh!") );
break;
}
case ID_LISTBOX_DELETE:
wxClientData *dataEvt = event.GetClientObject(),
*dataCtrl = choice->GetClientObject(sel);
- wxLogMessage(_T("EVT_CHOICE: item %d/%d (event/control), ")
- _T("string \"%s\"/\"%s\", ")
- _T("data \"%s\"/\"%s\""),
+ wxLogMessage(wxT("EVT_CHOICE: item %d/%d (event/control), ")
+ wxT("string \"%s\"/\"%s\", ")
+ wxT("data \"%s\"/\"%s\""),
(int)event.GetInt(),
sel,
event.GetString(),
}
case ID_CHOICE_SEL_STR:
{
- m_choice->SetStringSelection( _T("This") );
- m_choiceSorted->SetStringSelection( _T("This") );
+ m_choice->SetStringSelection( wxT("This") );
+ m_choiceSorted->SetStringSelection( wxT("This") );
break;
}
case ID_CHOICE_CLEAR:
}
case ID_CHOICE_APPEND:
{
- m_choice->Append( _T("Hi!") );
- m_choiceSorted->Append( _T("Hi!") );
+ m_choice->Append( wxT("Hi!") );
+ m_choiceSorted->Append( wxT("Hi!") );
break;
}
case ID_CHOICE_DELETE:
{
if (!m_combo)
return;
-
- wxLogMessage(_T("EVT_COMBOBOX: item %d/%d (event/control), string \"%s\"/\"%s\""),
+
+ wxLogMessage(wxT("EVT_COMBOBOX: item %d/%d (event/control), string \"%s\"/\"%s\""),
(int)event.GetInt(),
m_combo->GetSelection(),
event.GetString().c_str(),
void MyPanel::OnComboTextChanged(wxCommandEvent& event)
{
if (m_combo)
+ {
wxLogMessage(wxT("EVT_TEXT for the combobox: \"%s\" (event) or \"%s\" (control)."),
event.GetString().c_str(),
m_combo->GetValue().c_str());
+ }
}
void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event))
{
if (m_combo)
- wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."),
+ {
+ wxLogMessage(wxT("Enter pressed in the combobox: value is '%s'."),
m_combo->GetValue().c_str());
+ }
}
void MyPanel::OnComboButtons( wxCommandEvent &event )
}
case ID_COMBO_SEL_STR:
{
- m_combo->SetStringSelection( _T("This") );
+ m_combo->SetStringSelection( wxT("This") );
break;
}
case ID_COMBO_CLEAR:
}
case ID_COMBO_APPEND:
{
- m_combo->Append( _T("Hi!") );
+ m_combo->Append( wxT("Hi!") );
break;
}
case ID_COMBO_DELETE:
void MyPanel::OnRadio( wxCommandEvent &event )
{
- m_text->AppendText( _T("RadioBox selection string is: ") );
+ m_text->AppendText( wxT("RadioBox selection string is: ") );
m_text->AppendText( event.GetString() );
- m_text->AppendText( _T("\n") );
+ m_text->AppendText( wxT("\n") );
}
void MyPanel::OnRadioButton1( wxCommandEvent & WXUNUSED(event) )
{
- wxMessageBox(_T("First wxRadioButton selected."), _T("wxControl sample"));
+ wxMessageBox(wxT("First wxRadioButton selected."), wxT("wxControl sample"));
}
void MyPanel::OnRadioButton2( wxCommandEvent & WXUNUSED(event) )
{
- m_text->AppendText(_T("Second wxRadioButton selected.\n"));
+ m_text->AppendText(wxT("Second wxRadioButton selected.\n"));
}
void MyPanel::OnRadioButtons( wxCommandEvent &event )
break;
case ID_RADIOBOX_SEL_STR:
- m_radio->SetStringSelection( _T("This") );
+ m_radio->SetStringSelection( wxT("This") );
break;
case ID_RADIOBOX_FONT:
void MyPanel::OnUpdateLabel( wxCommandEvent &event )
{
- m_label->SetLabel(event.GetInt() ? _T("Very very very very very long text.")
- : _T("Shorter text."));
+ m_label->SetLabel(event.GetInt() ? wxT("Very very very very very long text.")
+ : wxT("Shorter text."));
}
#if wxUSE_SLIDER
if ( m_spinctrl )
{
wxString s;
- s.Printf( _T("Spin ctrl text changed: now %d (from event: %s)\n"),
+ s.Printf( wxT("Spin ctrl text changed: now %d (from event: %s)\n"),
m_spinctrl->GetValue(), event.GetString().c_str() );
m_text->AppendText(s);
}
if ( m_spinctrl )
{
wxString s;
- s.Printf( _T("Spin ctrl changed: now %d (from event: %d)\n"),
+ s.Printf( wxT("Spin ctrl changed: now %d (from event: %d)\n"),
m_spinctrl->GetValue(), event.GetInt() );
m_text->AppendText(s);
}
if ( m_spinctrl )
{
m_text->AppendText( wxString::Format(
- _T("Spin up: %d (from event: %d)\n"),
+ wxT("Spin up: %d (from event: %d)\n"),
m_spinctrl->GetValue(), event.GetInt() ) );
}
}
if ( m_spinctrl )
{
m_text->AppendText( wxString::Format(
- _T("Spin down: %d (from event: %d)\n"),
+ wxT("Spin down: %d (from event: %d)\n"),
m_spinctrl->GetValue(), event.GetInt() ) );
}
}
void MyPanel::OnSpinUp( wxSpinEvent &event )
{
wxString value;
- value.Printf( _T("Spin control up: current = %d\n"),
+ value.Printf( wxT("Spin control up: current = %d\n"),
m_spinbutton->GetValue());
if ( event.GetPosition() > 17 )
{
- value += _T("Preventing the spin button from going above 17.\n");
+ value += wxT("Preventing the spin button from going above 17.\n");
event.Veto();
}
void MyPanel::OnSpinDown( wxSpinEvent &event )
{
wxString value;
- value.Printf( _T("Spin control down: current = %d\n"),
+ value.Printf( wxT("Spin control down: current = %d\n"),
m_spinbutton->GetValue());
if ( event.GetPosition() < -17 )
{
- value += _T("Preventing the spin button from going below -17.\n");
+ value += wxT("Preventing the spin button from going below -17.\n");
event.Veto();
}
void MyPanel::OnSpinUpdate( wxSpinEvent &event )
{
wxString value;
- value.Printf( _T("%d"), event.GetPosition() );
+ value.Printf( wxT("%d"), event.GetPosition() );
m_spintext->SetValue( value );
- value.Printf( _T("Spin control range: (%d, %d), current = %d\n"),
+ value.Printf( wxT("Spin control range: (%d, %d), current = %d\n"),
m_spinbutton->GetMin(), m_spinbutton->GetMax(),
m_spinbutton->GetValue());
if ( max <= 0 )
{
- wxLogError(_T("You must set positive range!"));
+ wxLogError(wxT("You must set positive range!"));
return;
}
- wxProgressDialog dialog(_T("Progress dialog example"),
- _T("An informative message"),
+ wxProgressDialog dialog(wxT("Progress dialog example"),
+ wxT("An informative message"),
max, // range
this, // parent
wxPD_CAN_ABORT |
wxSleep(1);
if ( i == max )
{
- cont = dialog.Update(i, _T("That's all, folks!"));
+ cont = dialog.Update(i, wxT("That's all, folks!"));
}
else if ( i == max / 2 )
{
- cont = dialog.Update(i, _T("Only a half left (very long message)!"));
+ cont = dialog.Update(i, wxT("Only a half left (very long message)!"));
}
else
{
if ( !cont )
{
- *m_text << _T("Progress dialog aborted!\n");
+ *m_text << wxT("Progress dialog aborted!\n");
}
else
{
- *m_text << _T("Countdown from ") << max << _T(" finished.\n");
+ *m_text << wxT("Countdown from ") << max << wxT(" finished.\n");
}
}
MyPanel::~MyPanel()
{
- //wxLog::RemoveTraceMask(_T("focus"));
+ //wxLog::RemoveTraceMask(wxT("focus"));
delete wxLog::SetActiveTarget(m_logTargetOld);
delete m_book->GetImageList();
MyFrame::MyFrame(const wxChar *title, int x, int y)
: wxFrame(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(700, 450))
{
- SetHelpText( _T("Controls sample demonstrating various widgets") );
+ SetHelpText( wxT("Controls sample demonstrating various widgets") );
// 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
-#ifdef USE_XPM
- SetIcon( wxICON(mondrian) );
-#endif
+ SetIcon( wxICON(sample) );
wxMenu *file_menu = new wxMenu;
- file_menu->Append(CONTROLS_CLEAR_LOG, _T("&Clear log\tCtrl-L"));
+ file_menu->Append(CONTROLS_CLEAR_LOG, wxT("&Clear log\tCtrl-L"));
file_menu->AppendSeparator();
- file_menu->Append(CONTROLS_ABOUT, _T("&About\tF1"));
+ file_menu->Append(CONTROLS_ABOUT, wxT("&About\tF1"));
file_menu->AppendSeparator();
- file_menu->Append(CONTROLS_QUIT, _T("E&xit\tAlt-X"), _T("Quit controls sample"));
+ file_menu->Append(CONTROLS_QUIT, wxT("E&xit\tAlt-X"), wxT("Quit controls sample"));
wxMenuBar *menu_bar = new wxMenuBar;
- menu_bar->Append(file_menu, _T("&File"));
+ menu_bar->Append(file_menu, wxT("&File"));
#if wxUSE_TOOLTIPS
wxMenu *tooltip_menu = new wxMenu;
- tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, _T("Set &delay\tCtrl-D"));
+ tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, wxT("Set &delay\tCtrl-D"));
tooltip_menu->AppendSeparator();
- tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, _T("&Toggle tooltips\tCtrl-T"),
- _T("enable/disable tooltips"), true);
+ tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, wxT("&Toggle tooltips\tCtrl-T"),
+ wxT("enable/disable tooltips"), true);
tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, true);
#ifdef __WXMSW__
tooltip_menu->Append(CONTROLS_SET_TOOLTIPS_MAX_WIDTH, "Set maximal &width");
#endif // __WXMSW__
- menu_bar->Append(tooltip_menu, _T("&Tooltips"));
+ menu_bar->Append(tooltip_menu, wxT("&Tooltips"));
#endif // wxUSE_TOOLTIPS
wxMenu *panel_menu = new wxMenu;
- panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"),
- _T("Enable/disable all panel controls"), true);
- panel_menu->Append(CONTROLS_HIDE_ALL, _T("&Hide all\tCtrl-I"),
- _T("Show/hide thoe whole panel controls"), true);
- panel_menu->Append(CONTROLS_HIDE_LIST, _T("Hide &list ctrl\tCtrl-S"),
- _T("Enable/disable all panel controls"), true);
- panel_menu->Append(CONTROLS_CONTEXT_HELP, _T("&Context help...\tCtrl-H"),
- _T("Get context help for a control"));
- menu_bar->Append(panel_menu, _T("&Panel"));
+ panel_menu->Append(CONTROLS_ENABLE_ALL, wxT("&Disable all\tCtrl-E"),
+ wxT("Enable/disable all panel controls"), true);
+ panel_menu->Append(CONTROLS_HIDE_ALL, wxT("&Hide all\tCtrl-I"),
+ wxT("Show/hide thoe whole panel controls"), true);
+ panel_menu->Append(CONTROLS_HIDE_LIST, wxT("Hide &list ctrl\tCtrl-S"),
+ wxT("Enable/disable all panel controls"), true);
+ panel_menu->Append(CONTROLS_CONTEXT_HELP, wxT("&Context help...\tCtrl-H"),
+ wxT("Get context help for a control"));
+ menu_bar->Append(panel_menu, wxT("&Panel"));
SetMenuBar(menu_bar);
{
wxBusyCursor bc;
- wxMessageDialog dialog(this, _T("This is a control sample"), _T("About Controls"), wxOK );
+ wxMessageDialog dialog(this, wxT("This is a control sample"), wxT("About Controls"), wxOK );
dialog.ShowModal();
}
static long s_delay = 5000;
wxString delay;
- delay.Printf( _T("%ld"), s_delay);
+ delay.Printf( wxT("%ld"), s_delay);
- delay = wxGetTextFromUser(_T("Enter delay (in milliseconds)"),
- _T("Set tooltip delay"),
+ delay = wxGetTextFromUser(wxT("Enter delay (in milliseconds)"),
+ wxT("Set tooltip delay"),
delay,
this);
if ( !delay )
return; // cancelled
- wxSscanf(delay, _T("%ld"), &s_delay);
+ wxSscanf(delay, wxT("%ld"), &s_delay);
wxToolTip::SetDelay(s_delay);
- wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
+ wxLogStatus(this, wxT("Tooltip delay set to %ld milliseconds"), s_delay);
}
void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event))
wxToolTip::Enable(s_enabled);
- wxLogStatus(this, _T("Tooltips %sabled"), s_enabled ? _T("en") : _T("dis") );
+ wxLogStatus(this, wxT("Tooltips %sabled"), s_enabled ? wxT("en") : wxT("dis") );
}
#ifdef __WXMSW__
void MyFrame::OnIconized( wxIconizeEvent& event )
{
- wxLogMessage(_T("Frame %s"), event.IsIconized() ? _T("iconized")
- : _T("restored"));
+ wxLogMessage(wxT("Frame %s"), event.IsIconized() ? wxT("iconized")
+ : wxT("restored"));
event.Skip();
}
void MyFrame::OnMaximized( wxMaximizeEvent& WXUNUSED(event) )
{
- wxLogMessage(_T("Frame maximized"));
+ wxLogMessage(wxT("Frame maximized"));
}
void MyFrame::OnSize( wxSizeEvent& event )
if ( focus )
{
msg.Printf(
- _T("Focus: %s")
+ "Focus: %s"
#ifdef __WXMSW__
- , _T(", HWND = %08x")
+ ", HWND = %08x"
#endif
, s_windowFocus->GetName().c_str()
#ifdef __WXMSW__
}
else
{
- msg = _T("No focus");
+ msg = wxT("No focus");
}
#if wxUSE_STATUSBAR
void MyComboBox::OnChar(wxKeyEvent& event)
{
- wxLogMessage(_T("MyComboBox::OnChar"));
+ wxLogMessage(wxT("MyComboBox::OnChar"));
if ( event.GetKeyCode() == 'w' )
- wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
+ {
+ wxLogMessage(wxT("MyComboBox: 'w' will be ignored."));
+ }
else
+ {
event.Skip();
+ }
}
void MyComboBox::OnKeyDown(wxKeyEvent& event)
{
- wxLogMessage(_T("MyComboBox::OnKeyDown"));
+ wxLogMessage(wxT("MyComboBox::OnKeyDown"));
if ( event.GetKeyCode() == 'w' )
- wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
+ {
+ wxLogMessage(wxT("MyComboBox: 'w' will be ignored."));
+ }
else
+ {
event.Skip();
+ }
}
void MyComboBox::OnKeyUp(wxKeyEvent& event)
{
- wxLogMessage(_T("MyComboBox::OnKeyUp"));
+ wxLogMessage(wxT("MyComboBox::OnKeyUp"));
event.Skip();
}
projects / wxWidgets.git / blobdiff