#ifdef __WIN16__
// Win16 doesn't have them
- #undef wxUSE_SPINBUTTON
- #define wxUSE_SPINBUTTON 0
+ #ifdef wxUSE_SPINBTN
+ #undef wxUSE_SPINBTN
+ #endif
+ #define wxUSE_SPINBTN 0
#else
- #if !defined(wxUSE_SPINBUTTON)
- #define wxUSE_SPINBUTTON 1
+ #ifndef wxUSE_SPINBTN
+ #define wxUSE_SPINBTN 1
#endif
#endif // __WIN16__
#include "wx/progdlg.h"
-// VZ: this is a temp. hack, will remove soon
-#define wxUSE_SPINCTRL 1
-
#if wxUSE_SPINCTRL
#include "wx/spinctrl.h"
#endif // wxUSE_SPINCTRL
void OnPageChanging( wxNotebookEvent &event );
void OnSliderUpdate( wxCommandEvent &event );
void OnUpdateLabel( wxCommandEvent &event );
-#if wxUSE_SPINBUTTON
+#if wxUSE_SPINBTN
void OnSpinUp( wxSpinEvent &event );
void OnSpinDown( wxSpinEvent &event );
void OnSpinUpdate( wxSpinEvent &event );
void OnUpdateShowProgress( wxUpdateUIEvent& event );
void OnShowProgress( wxCommandEvent &event );
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
- void OnSpinCtrl(wxSpinEvent& event);
+ void OnSpinCtrl(wxCommandEvent& event);
#endif // wxUSE_SPINCTRL
void OnEnableAll(wxCommandEvent& event);
wxButton *m_fontButton;
wxButton *m_lbSelectNum;
wxButton *m_lbSelectThis;
-#if wxUSE_SPINBUTTON
+#if wxUSE_SPINBTN
wxSpinButton *m_spinbutton;
wxButton *m_btnProgress;
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
wxSpinCtrl *m_spinctrl;
void OnIdle( wxIdleEvent& event );
void OnSize( wxSizeEvent& event );
+ void OnMove( wxMoveEvent& event );
+
+ MyPanel *GetPanel() const { return m_panel; }
private:
- wxPanel *m_panel;
+ 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);
+ }
+
+ MyPanel *m_panel;
DECLARE_EVENT_TABLE()
};
bool MyApp::OnInit()
{
+ // parse the cmd line
+ int x = 50,
+ y = 50;
+ if ( argc == 2 )
+ {
+ wxSscanf(argv[1], "%d", &x);
+ wxSscanf(argv[2], "%d", &y);
+ }
+
// Create the main frame window
MyFrame *frame = new MyFrame((wxFrame *) NULL,
"Controls wxWindows App",
- 50, 50, 530, 420);
+ x, y, 540, 430);
+
+ frame->SetSizeHints( 500, 425 );
// Give it an icon
// The wxICON() macros loads an icon from a resource under Windows
frame->SetIcon( wxICON(mondrian) );
- wxMenu *file_menu = new wxMenu("", wxMENU_TEAROFF );
+ 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");
frame->Show(TRUE);
frame->SetCursor(wxCursor(wxCURSOR_HAND));
+ frame->GetPanel()->m_notebook->SetSelection(6);
+
SetTopWindow(frame);
return TRUE;
EVT_CHECKBOX (ID_RADIOBOX_ENABLE, MyPanel::OnRadioButtons)
EVT_BUTTON (ID_SET_FONT, MyPanel::OnSetFont)
EVT_SLIDER (ID_SLIDER, MyPanel::OnSliderUpdate)
-#if wxUSE_SPINBUTTON
+#if wxUSE_SPINBTN
EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate)
EVT_SPIN_UP (ID_SPIN, MyPanel::OnSpinUp)
EVT_SPIN_DOWN (ID_SPIN, MyPanel::OnSpinDown)
EVT_UPDATE_UI (ID_BTNPROGRESS, MyPanel::OnUpdateShowProgress)
EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress)
-#endif // wxUSE_SPINBUTTON
+#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)
EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour)
: wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
m_text(NULL), m_notebook(NULL)
{
+ wxLayoutConstraints *c;
+
m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
// m_text->SetBackgroundColour("wheat");
- delete wxLog::SetActiveTarget(new wxLogStderr);
+ //delete wxLog::SetActiveTarget(new wxLogStderr);
m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
(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) );
+
+ button->SetDefault();
+
+ button->SetForegroundColour(*wxBLUE);
+
#if wxUSE_TOOLTIPS
button->SetToolTip( "Press here to set italic font" );
#endif // wxUSE_TOOLTIPS
m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1),
5, choices, wxCB_SORT );
+#ifndef __WXMOTIF__
SetControlClientData("choice", m_choice);
SetControlClientData("choice", m_choiceSorted);
+#endif
m_choice->SetSelection(2);
m_choice->SetBackgroundColour( "red" );
m_notebook->AddPage(panel, "wxChoice", FALSE, Image_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 wxStaticBox( panel, -1, "Box around combobox",
+ wxPoint(5, 5), wxSize(150, 100));
+ m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(20,25), 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) );
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 );
+
+#if wxUSE_TOOLTIPS
+ 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), wxSize(140,30) );
- wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP );
+ (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);
wxString s;
s << initialSpinValue;
m_spintext = new wxTextCtrl( panel, -1, s, wxPoint(20,160), wxSize(80,-1) );
-#if wxUSE_SPINBUTTON
+#if wxUSE_SPINBTN
m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, -1) );
m_spinbutton->SetRange(-10,30);
m_spinbutton->SetValue(initialSpinValue);
m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog",
wxPoint(300, 160) );
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, "", wxPoint(200, 160), wxSize(80, -1) );
#ifndef __WXMOTIF__ // wxStaticBitmap not working under Motif yet. MB
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));
+
+#if 0
+ bitmap = wxBitmap("../../utils/wxPython/tests/bitmaps/test2.bmp",
+ wxBITMAP_TYPE_BMP);
+ bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+ (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(300, 120));
+#endif
+
+ 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, 50)
+ );
+ bmpBtn->SetBitmapSelected(bmp2);
+ bmpBtn->SetBitmapFocus(bmp3);
+
(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,
m_notebook->AddPage(panel, "wxBitmapXXX");
-// --------------- TEST CODE ----------------------
-
- // layout constraints
-
- panel = new wxPanel(m_notebook);
- panel->SetAutoLayout( TRUE );
-
- 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 );
+ // layout constraints
- wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
- pMyButton->SetConstraints( c );
+ panel = new wxPanel(m_notebook);
+ panel->SetAutoLayout( TRUE );
- 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 );
+ c = new wxLayoutConstraints;
+ c->top.SameAs( panel, wxTop, 10 );
+ c->height.AsIs( );
+ c->left.SameAs( panel, wxLeft, 10 );
+ c->width.PercentOf( panel, wxWidth, 40 );
- wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
- pMyButton2->SetConstraints( c );
+ wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
+ pMyButton->SetConstraints( c );
- m_notebook->AddPage(panel, "wxLayoutConstraint");
+ 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
+ wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
+ pMyButton2->SetConstraints( c );
- panel = new wxPanel(m_notebook);
- panel->SetAutoLayout( TRUE );
+ m_notebook->AddPage(panel, "wxLayoutConstraint");
- wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+ // sizer
- 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 );
+ panel = new wxPanel(m_notebook);
+ panel->SetAutoLayout( TRUE );
- panel->SetSizer( sizer );
+ wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
- m_notebook->AddPage(panel, "wxSizer");
+ 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 );
-// --------------- TEST CODE ----------------------
+ panel->SetSizer( sizer );
+ m_notebook->AddPage(panel, "wxSizer");
}
void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
SetBackgroundColour(s_colOld);
s_colOld = wxNullColour;
+ m_lbSelectThis->SetForegroundColour("yellow");
m_lbSelectThis->SetBackgroundColour("blue");
}
else
s_colOld = GetBackgroundColour();
SetBackgroundColour("green");
+ m_lbSelectThis->SetForegroundColour("white");
m_lbSelectThis->SetBackgroundColour("red");
}
void MyPanel::OnListBox( wxCommandEvent &event )
{
+// GetParent()->Move(100, 100);
+
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" );
}
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 );
break;
}
#if wxUSE_SPINCTRL
-void MyPanel::OnSpinCtrl(wxSpinEvent& event)
+void MyPanel::OnSpinCtrl(wxCommandEvent& 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);
}
#endif // wxUSE_SPINCTRL
-#if wxUSE_SPINBUTTON
+#if wxUSE_SPINBTN
void MyPanel::OnSpinUp( wxSpinEvent &event )
{
wxString value;
}
}
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
MyPanel::~MyPanel()
{
EVT_MENU(MINIMAL_ENABLE_ALL, MyFrame::OnEnableAll)
EVT_SIZE(MyFrame::OnSize)
+ EVT_MOVE(MyFrame::OnMove)
+
EVT_IDLE(MyFrame::OnIdle)
END_EVENT_TABLE()
m_panel->Enable(s_enable);
}
+void MyFrame::OnMove( wxMoveEvent& event )
+{
+ UpdateStatusBar(event.GetPosition(), GetSize());
+
+ event.Skip();
+}
+
void MyFrame::OnSize( wxSizeEvent& event )
{
- wxString msg;
- msg.Printf( _("%dx%d"), event.GetSize().x, event.GetSize().y);
- SetStatusText(msg, 1);
+ UpdateStatusBar(GetPosition(), event.GetSize());
event.Skip();
}
projects / wxWidgets.git / blobdiff