#include "wx/spinbutt.h"
#endif
#include "wx/tglbtn.h"
-#include "wx/notebook.h"
+#include "wx/bookctrl.h"
#include "wx/imaglist.h"
#include "wx/artprov.h"
#include "wx/spinctrl.h"
#endif // wxUSE_SPINCTRL
+#if !wxUSE_TOGGLEBTN
+ #define wxToggleButton wxCheckBox
+ #define EVT_TOGGLEBUTTON EVT_CHECKBOX
+#endif
+
//----------------------------------------------------------------------
// class definitions
//----------------------------------------------------------------------
void OnRadioButton1( wxCommandEvent &event );
void OnRadioButton2( wxCommandEvent &event );
void OnSetFont( wxCommandEvent &event );
- void OnPageChanged( wxNotebookEvent &event );
- void OnPageChanging( wxNotebookEvent &event );
+ void OnPageChanged( wxBookCtrlEvent &event );
+ void OnPageChanging( wxBookCtrlEvent &event );
void OnSliderUpdate( wxCommandEvent &event );
void OnUpdateLabel( wxCommandEvent &event );
#if wxUSE_SPINBTN
void OnSpinUp( wxSpinEvent &event );
void OnSpinDown( wxSpinEvent &event );
void OnSpinUpdate( wxSpinEvent &event );
+#if wxUSE_PROGRESSDLG
void OnUpdateShowProgress( wxUpdateUIEvent& event );
void OnShowProgress( wxCommandEvent &event );
+#endif // wxUSE_PROGRESSDLG
#endif // wxUSE_SPINBTN
-
+ void OnNewText( wxCommandEvent &event );
#if wxUSE_SPINCTRL
void OnSpinCtrl(wxSpinEvent& event);
void OnSpinCtrlUp(wxSpinEvent& event);
void OnChangeColour(wxCommandEvent& event);
void OnTestButton(wxCommandEvent& event);
void OnBmpButton(wxCommandEvent& event);
+ void OnBmpButtonToggle(wxCommandEvent& event);
void OnSizerCheck (wxCommandEvent &event);
wxComboBox *m_combo;
wxRadioBox *m_radio;
+#if wxUSE_GAUGE
wxGauge *m_gauge,
*m_gaugeVert;
+#endif // wxUSE_GAUGE
+#if wxUSE_SLIDER
wxSlider *m_slider;
+#endif // wxUSE_SLIDER
wxButton *m_fontButton;
wxButton *m_lbSelectNum;
wxButton *m_lbSelectThis;
#if wxUSE_SPINBTN
wxSpinButton *m_spinbutton;
+#if wxUSE_PROGRESSDLG
wxButton *m_btnProgress;
+#endif // wxUSE_PROGRESSDLG
#endif // wxUSE_SPINBTN
+ wxStaticText *m_wrappingText;
+ wxStaticText *m_nonWrappingText;
#if wxUSE_SPINCTRL
wxSpinCtrl *m_spinctrl;
wxCheckBox *m_checkbox;
wxTextCtrl *m_text;
- wxNotebook *m_notebook;
+ wxBookCtrl *m_book;
wxStaticText *m_label;
void OnEnableAll(wxCommandEvent& event);
void OnIdle( wxIdleEvent& event );
+ void OnIconized( wxIconizeEvent& event );
+ void OnMaximized( wxMaximizeEvent& event );
void OnSize( wxSizeEvent& event );
void OnMove( wxMoveEvent& event );
DECLARE_EVENT_TABLE()
};
+// a choice which handles focus set/kill (for testing)
+class MyChoice : public wxChoice
+{
+public:
+ MyChoice(wxWindow *parent,
+ wxWindowID id,
+ 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 = wxChoiceNameStr )
+ : wxChoice(parent, id, pos, size, n, choices,
+ style, validator, name) { }
+
+protected:
+ void OnFocusGot(wxFocusEvent& event)
+ {
+ wxLogMessage(_T("MyChoice::OnFocusGot"));
+
+ event.Skip();
+ }
+
+ void OnFocusLost(wxFocusEvent& event)
+ {
+ wxLogMessage(_T("MyChoice::OnFocusLost"));
+
+ event.Skip();
+ }
+
+private:
+ DECLARE_EVENT_TABLE()
+};
+
+
+
//----------------------------------------------------------------------
// other
//----------------------------------------------------------------------
enum
{
- CONTROLS_QUIT = 100,
- CONTROLS_TEXT,
- CONTROLS_ABOUT,
+ CONTROLS_QUIT = wxID_EXIT,
+ CONTROLS_ABOUT = wxID_ABOUT,
+ CONTROLS_TEXT = 100,
CONTROLS_CLEAR_LOG,
// tooltip menu
// MyPanel
//----------------------------------------------------------------------
-const int ID_NOTEBOOK = 1000;
+const int ID_BOOK = 1000;
const int ID_LISTBOX = 130;
const int ID_LISTBOX_SEL_NUM = 131;
const int ID_SET_FONT = 170;
+#if wxUSE_GAUGE
const int ID_GAUGE = 180;
+#endif // wxUSE_GAUGE
+
+#if wxUSE_SLIDER
const int ID_SLIDER = 181;
+#endif // wxUSE_SLIDER
const int ID_SPIN = 182;
+#if wxUSE_PROGRESSDLG
const int ID_BTNPROGRESS = 183;
+#endif // wxUSE_PROGRESSDLG
const int ID_BUTTON_LABEL = 184;
const int ID_SPINCTRL = 185;
+const int ID_BTNNEWTEXT = 186;
const int ID_BUTTON_TEST1 = 190;
const int ID_BUTTON_TEST2 = 191;
const int ID_BITMAP_BTN = 192;
+const int ID_BITMAP_BTN_ENABLE = 193;
const int ID_CHANGE_COLOUR = 200;
BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_SIZE ( MyPanel::OnSize)
-EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyPanel::OnPageChanging)
-EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, MyPanel::OnPageChanged)
+EVT_BOOKCTRL_PAGE_CHANGING(ID_BOOK, MyPanel::OnPageChanging)
+EVT_BOOKCTRL_PAGE_CHANGED(ID_BOOK, MyPanel::OnPageChanged)
EVT_LISTBOX (ID_LISTBOX, MyPanel::OnListBox)
EVT_LISTBOX (ID_LISTBOX_SORTED, MyPanel::OnListBox)
EVT_LISTBOX_DCLICK(ID_LISTBOX, MyPanel::OnListBoxDoubleClick)
EVT_RADIOBUTTON(ID_RADIOBUTTON_1, MyPanel::OnRadioButton1)
EVT_RADIOBUTTON(ID_RADIOBUTTON_2, MyPanel::OnRadioButton2)
EVT_BUTTON (ID_SET_FONT, MyPanel::OnSetFont)
+#if wxUSE_SLIDER
EVT_SLIDER (ID_SLIDER, MyPanel::OnSliderUpdate)
+#endif // wxUSE_SLIDER
#if wxUSE_SPINBTN
EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate)
EVT_SPIN_UP (ID_SPIN, MyPanel::OnSpinUp)
EVT_SPIN_DOWN (ID_SPIN, MyPanel::OnSpinDown)
+#if wxUSE_PROGRESSDLG
EVT_UPDATE_UI (ID_BTNPROGRESS, MyPanel::OnUpdateShowProgress)
EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress)
+#endif // wxUSE_PROGRESSDLG
#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl)
EVT_SPIN_DOWN (ID_SPINCTRL, MyPanel::OnSpinCtrlDown)
EVT_TEXT (ID_SPINCTRL, MyPanel::OnSpinCtrlText)
#endif // wxUSE_SPINCTRL
-#if wxUSE_TOGGLEBTN
+EVT_BUTTON (ID_BTNNEWTEXT, MyPanel::OnNewText)
EVT_TOGGLEBUTTON(ID_BUTTON_LABEL, MyPanel::OnUpdateLabel)
-#else
-EVT_CHECKBOX(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)
+EVT_TOGGLEBUTTON(ID_BITMAP_BTN_ENABLE, MyPanel::OnBmpButtonToggle)
EVT_CHECKBOX (ID_SIZER_CHECK1, MyPanel::OnSizerCheck)
EVT_CHECKBOX (ID_SIZER_CHECK2, MyPanel::OnSizerCheck)
EVT_KILL_FOCUS(MyRadioBox::OnFocusLost)
END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(MyChoice, wxChoice)
+ EVT_SET_FOCUS(MyChoice::OnFocusGot)
+ EVT_KILL_FOCUS(MyChoice::OnFocusLost)
+END_EVENT_TABLE()
+
// ============================================================================
// implementation
// ============================================================================
#if wxUSE_CHOICE
m_choice = NULL;
m_choiceSorted = NULL;
-#endif
+#endif // wxUSE_CHOICE
m_combo = NULL;
m_radio = NULL;
+#if wxUSE_GAUGE
m_gauge = NULL;
m_gaugeVert = NULL;
+#endif // wxUSE_GAUGE
+#if wxUSE_SLIDER
m_slider = NULL;
+#endif // wxUSE_SLIDER
m_fontButton = NULL;
m_lbSelectNum = NULL;
m_lbSelectThis = NULL;
#if wxUSE_SPINBTN
m_spinbutton = NULL;
+#if wxUSE_PROGRESSDLG
m_btnProgress = NULL;
+#endif // wxUSE_PROGRESSDLG
#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
m_spinctrl = NULL;
m_spintext = NULL;
m_checkbox = NULL;
m_text = NULL;
- m_notebook = NULL;
+ m_book = NULL;
m_label = NULL;
m_text = new wxTextCtrl(this, wxID_ANY, _T("This is the log window.\n"),
m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
- m_notebook = new wxNotebook(this, ID_NOTEBOOK);
+ m_book = new wxBookCtrl(this, ID_BOOK);
wxString choices[] =
{
// image ids
enum
{
- Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
+ Image_List,
+ Image_Choice,
+ Image_Combo,
+ Image_Text,
+ Image_Radio,
+#if wxUSE_GAUGE
+ Image_Gauge,
+#endif // wxUSE_GAUGE
+ Image_Max
};
// fill the image list
imagelist-> Add( wxBitmap( combo_xpm ));
imagelist-> Add( wxBitmap( text_xpm ));
imagelist-> Add( wxBitmap( radio_xpm ));
+#if wxUSE_GAUGE
imagelist-> Add( wxBitmap( gauge_xpm ));
- m_notebook->SetImageList(imagelist);
+#endif // wxUSE_GAUGE
+ m_book->SetImageList(imagelist);
#elif defined(__WXMSW__)
// load images from resources
enum
{
- Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
+ Image_List,
+ Image_Choice,
+ Image_Combo,
+ Image_Text,
+ Image_Radio,
+#if wxUSE_GAUGE
+ Image_Gauge,
+#endif // wxUSE_GAUGE
+ Image_Max
};
wxImageList *imagelist = new wxImageList(16, 16, false, Image_Max);
static const wxChar *s_iconNames[Image_Max] =
{
- _T("list"), _T("choice"), _T("combo"), _T("text"), _T("radio"),
- _T("gauge")
+ _T("list")
+ , _T("choice")
+ , _T("combo")
+ , _T("text")
+ , _T("radio")
+#if wxUSE_GAUGE
+ , _T("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) )
{
- wxLogWarning(wxT("Couldn't load the image '%s' for the notebook page %d."),
+ wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."),
s_iconNames[n], n);
}
}
- m_notebook->SetImageList(imagelist);
+ m_book->SetImageList(imagelist);
#else
// No images for now
#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
- wxPanel *panel = new wxPanel(m_notebook);
+ wxPanel *panel = new wxPanel(m_book);
m_listbox = new wxListBox( panel, ID_LISTBOX,
wxPoint(10,10), wxSize(120,70),
- 5, choices, wxLB_ALWAYS_SB );
+ 5, choices, wxLB_MULTIPLE |wxLB_ALWAYS_SB );
m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED,
wxPoint(10,90), wxSize(120,70),
5, choices, wxLB_SORT );
wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
button->SetDefault();
-
button->SetForegroundColour(*wxBLUE);
#if wxUSE_TOOLTIPS
m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) );
m_checkbox->SetValue(false);
+ button->MoveAfterInTabOrder(m_checkbox);
#if wxUSE_TOOLTIPS
m_checkbox->SetToolTip( _T("Click here to disable the listbox") );
#endif // wxUSE_TOOLTIPS
(void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),
wxPoint(110,170) );
panel->SetCursor(wxCursor(wxCURSOR_HAND));
- m_notebook->AddPage(panel, _T("wxListBox"), true, Image_List);
+ m_book->AddPage(panel, _T("wxListBox"), true, Image_List);
#if wxUSE_CHOICE
- panel = new wxPanel(m_notebook);
- m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultSize.y), 5, choices );
- m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultSize.y),
+ panel = new wxPanel(m_book);
+ m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices );
+ m_choiceSorted = new MyChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord),
5, choices, wxCB_SORT );
SetChoiceClientData(wxT("choice"), m_choice);
(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_notebook->AddPage(panel, _T("wxChoice"), false, Image_Choice);
+ m_book->AddPage(panel, _T("wxChoice"), false, Image_Choice);
#endif // wxUSE_CHOICE
- panel = new wxPanel(m_notebook);
+ 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, wxDefaultSize.y),
+ wxPoint(20,25), wxSize(120, wxDefaultCoord),
5, choices,
wxCB_READONLY | wxPROCESS_ENTER);
m_combo->SetBackgroundColour(*wxBLUE);
(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 wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
- m_notebook->AddPage(panel, _T("wxComboBox"), false, Image_Combo);
+ m_book->AddPage(panel, _T("wxComboBox"), false, Image_Combo);
wxString choices2[] =
{
"Seventh", "Eighth", "Nineth", "Tenth" */
};
- panel = new wxPanel(m_notebook);
+ panel = new wxPanel(m_book);
(void)new MyRadioBox( panel, ID_RADIOBOX, _T("&That"), wxPoint(10,160), wxDefaultSize, WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
m_radio = new wxRadioBox( panel, ID_RADIOBOX, _T("T&his"), wxPoint(10,10), wxDefaultSize, WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
m_radio->SetForegroundColour(*wxRED);
wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
rb->SetValue( false );
(void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );
- m_notebook->AddPage(panel, _T("wxRadioBox"), false, Image_Radio);
+ m_book->AddPage(panel, _T("wxRadioBox"), false, Image_Radio);
+
- panel = new wxPanel(m_notebook);
- (void)new wxStaticBox( panel, wxID_ANY, _T("&wxGauge and wxSlider"), wxPoint(10,10), wxSize(222,130) );
- m_gauge = new wxGauge( panel, wxID_ANY, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
+#if wxUSE_SLIDER && wxUSE_GAUGE
+ panel = new wxPanel(m_book);
+
+ wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );
+ panel->SetSizer( main_sizer );
+
+ wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, _T("&wxGauge and wxSlider") );
+ main_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_gauge->SetBackgroundColour(*wxGREEN);
m_gauge->SetForegroundColour(*wxRED);
- m_gaugeVert = new wxGauge( panel, wxID_ANY, 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,wxDefaultSize.y),
- wxSL_AUTOTICKS | wxSL_LABELS );
+ sz->Add( m_gauge, 0, wxALL, 10 );
+ m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200,
+ wxDefaultPosition, wxSize(155,wxDefaultCoord),
+ wxSL_AUTOTICKS | wxSL_LABELS);
m_slider->SetTickFreq(40, 0);
#if wxUSE_TOOLTIPS
m_slider->SetToolTip(_T("This is a sliding slider"));
#endif // wxUSE_TOOLTIPS
+ sz->Add( m_slider, 0, wxALL, 10 );
+
+ m_gaugeVert = new wxGauge( panel, wxID_ANY, 100,
+ wxDefaultPosition, wxSize(wxDefaultCoord, 90),
+ wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
+ gauge_sizer->Add( m_gaugeVert, 0, wxALL, 10 );
- (void)new wxStaticBox( panel, wxID_ANY, _T("&Explanation"),
- wxPoint(230,10), wxSize(270,130),
- wxALIGN_CENTER );
+
+
+ wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, _T("&Explanation"),
+ wxDefaultPosition, wxDefaultSize ); //, wxALIGN_CENTER );
+ wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL );
+ main_sizer->Add( wrapping_sizer, 0, wxALL, 5 );
#ifdef __WXMOTIF__
// No wrapping text in wxStaticText yet :-(
- (void)new wxStaticText( panel, wxID_ANY,
+ m_wrappingText = new wxStaticText( panel, wxID_ANY,
_T("Drag the slider!"),
wxPoint(250,30),
- wxSize(240, wxDefaultSize.y)
+ wxSize(240, wxDefaultCoord)
);
#else
- (void)new wxStaticText( panel, wxID_ANY,
- _T("In order see the gauge (aka progress bar)\n")
- _T("control do something you have to drag the\n")
- _T("handle of the slider to the right.\n")
- _T("\n")
- _T("This is also supposed to demonstrate how\n")
- _T("to use static controls.\n"),
- wxPoint(250,25),
- wxSize(240, 110)
+ 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."),
+ wxDefaultPosition,
+ wxSize(240, -1)
);
#endif
+ 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 );
+
+ m_nonWrappingText = new wxStaticText( panel, wxID_ANY,
+ _T("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) );
+
int initialSpinValue = -5;
wxString s;
s << initialSpinValue;
- m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultSize.y) );
+ m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) );
#if wxUSE_SPINBTN
- m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, wxDefaultSize.y) );
+ m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160) );
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
#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
- m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, wxDefaultSize.y) );
+ m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, wxDefaultCoord) );
m_spinctrl->SetRange(10,30);
m_spinctrl->SetValue(15);
#endif // wxUSE_SPINCTRL
- m_notebook->AddPage(panel, _T("wxGauge"), false, Image_Gauge);
+ m_book->AddPage(panel, _T("wxGauge"), false, Image_Gauge);
+#endif // wxUSE_SLIDER && wxUSE_GAUGE
+
- panel = new wxPanel(m_notebook);
+ panel = new wxPanel(m_book);
#if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet.
wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);
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));
#if defined(__WXMSW__) || defined(__WXMOTIF__)
// test for masked bitmap display
{
bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
- (void)new wxStaticBitmap /* wxBitmapButton */ (panel, wxID_ANY, bitmap, wxPoint(300, 120));
+ (void)new wxStaticBitmap(panel, wxID_ANY, bitmap, wxPoint(300, 120));
}
#endif
bmpBtn->SetBitmapSelected(bmp2);
bmpBtn->SetBitmapFocus(bmp3);
-#if wxUSE_TOGGLEBTN
(void)new wxToggleButton(panel, ID_BUTTON_LABEL,
_T("&Toggle label"), wxPoint(250, 20));
-#else
- (void)new wxCheckBox(panel, ID_BUTTON_LABEL,
- _T("&Toggle label"), wxPoint(250, 20));
-#endif // wxUSE_TOGGLEBTN
m_label = new wxStaticText(panel, wxID_ANY, _T("Label with some long text"),
wxPoint(250, 60), wxDefaultSize,
wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
m_label->SetForegroundColour( *wxBLUE );
- m_notebook->AddPage(panel, _T("wxBitmapXXX"));
+ m_book->AddPage(panel, _T("wxBitmapXXX"));
// sizer
- panel = new wxPanel(m_notebook);
+ panel = new wxPanel(m_book);
panel->SetAutoLayout( true );
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer *csizer =
new wxStaticBoxSizer (new wxStaticBox (panel, wxID_ANY, _T("Show Buttons")), wxHORIZONTAL );
-
+
wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig;
check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, _T("1"));
check1->SetValue (true);
checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big"));
checkBig->SetValue (true);
csizer->Add (checkBig);
-
+
sizer->Add (csizer);
m_hsizer = new wxBoxSizer( wxHORIZONTAL );
m_buttonSizer = new wxBoxSizer (wxVERTICAL);
-
+
m_sizerBtn1 = new wxButton(panel, wxID_ANY, _T("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)") );
panel->SetSizer( sizer );
- m_notebook->AddPage(panel, _T("wxSizer"));
+ m_book->AddPage(panel, _T("wxSizer"));
}
void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
int y = 0;
GetClientSize( &x, &y );
- if (m_notebook) m_notebook->SetSize( 2, 2, x-4, y*2/3-4 );
+ if (m_book) m_book->SetSize( 2, 2, x-4, y*2/3-4 );
if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 );
}
-void MyPanel::OnPageChanging( wxNotebookEvent &event )
+void MyPanel::OnPageChanging( wxBookCtrlEvent &event )
{
int selOld = event.GetOldSelection();
if ( selOld == 2 )
}
}
- *m_text << _T("Notebook selection is being changed from ") << selOld
+ *m_text << _T("Book selection is being changed from ") << selOld
<< _T(" to ") << event.GetSelection()
- << _T(" (current page from notebook is ")
- << m_notebook->GetSelection() << _T(")\n");
+ << _T(" (current page from book is ")
+ << m_book->GetSelection() << _T(")\n");
}
-void MyPanel::OnPageChanged( wxNotebookEvent &event )
+void MyPanel::OnPageChanged( wxBookCtrlEvent &event )
{
- *m_text << _T("Notebook selection is now ") << event.GetSelection()
- << _T(" (from notebook: ") << m_notebook->GetSelection()
+ *m_text << _T("Book selection is now ") << event.GetSelection()
+ << _T(" (from book: ") << m_book->GetSelection()
<< _T(")\n");
}
wxLogMessage(_T("Bitmap button clicked."));
}
+void MyPanel::OnBmpButtonToggle(wxCommandEvent& event)
+{
+ FindWindow(ID_BITMAP_BTN)->Enable(!event.IsChecked());
+}
+
void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
{
static wxColour s_colOld;
: _T("Shorter text."));
}
+#if wxUSE_SLIDER
+
void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
{
+#if wxUSE_GAUGE
m_gauge->SetValue( m_slider->GetValue() );
m_gaugeVert->SetValue( m_slider->GetValue() / 2 );
+#endif // wxUSE_GAUGE
}
+#endif // wxUSE_SLIDER
+
#if wxUSE_SPINCTRL
void MyPanel::OnSpinCtrlText(wxCommandEvent& event)
m_text->AppendText(value);
}
+void MyPanel::OnNewText( wxCommandEvent& /* event */)
+{
+ m_nonWrappingText->SetLabel( wxT("This text is short\nbut still spans\nover three lines.") );
+ m_wrappingText->SetLabel( wxT("This text is short but will still be wrapped if it is too long.") );
+ m_wrappingText->GetParent()->Layout();
+}
+
+#if wxUSE_PROGRESSDLG
+
void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event )
{
event.Enable( m_spinbutton->GetValue() > 0 );
void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
{
int max = m_spinbutton->GetValue();
-
+
if ( max <= 0 )
{
wxLogError(_T("You must set positive range!"));
return;
}
-
+
wxProgressDialog dialog(_T("Progress dialog example"),
_T("An informative message"),
max, // range
}
}
+#endif // wxUSE_PROGRESSDLG
#endif // wxUSE_SPINBTN
void MyPanel::OnSizerCheck( wxCommandEvent &event)
//wxLog::RemoveTraceMask(_T("focus"));
delete wxLog::SetActiveTarget(m_logTargetOld);
- delete m_notebook->GetImageList();
+ delete m_book->GetImageList();
}
//----------------------------------------------------------------------
EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll)
+ EVT_ICONIZE(MyFrame::OnIconized)
+ EVT_MAXIMIZE(MyFrame::OnMaximized)
EVT_SIZE(MyFrame::OnSize)
EVT_MOVE(MyFrame::OnMove)
event.Skip();
}
+void MyFrame::OnIconized( wxIconizeEvent& event )
+{
+ wxLogMessage(_T("Frame %s"), event.Iconized() ? _T("iconized")
+ : _T("restored"));
+ event.Skip();
+}
+
+void MyFrame::OnMaximized( wxMaximizeEvent& WXUNUSED(event) )
+{
+ wxLogMessage(_T("Frame maximized"));
+}
+
void MyFrame::OnSize( wxSizeEvent& event )
{
#if wxUSE_STATUSBAR
projects / wxWidgets.git / blobdiff