AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. added some test code (currently disabled) to controls

Browse Source 
2. removed test code (oops...) from minimal


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-22 01:45:24 +00:00
parent 00c4e8974d
commit 29e7e51a4d
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
samples/controls/controls.cpp
View File

@ -140,6 +140,8 @@ public:
wxStaticText *m_label; wxStaticText *m_label;
private: private:
wxLog *m_logTargetOld;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@ -382,7 +384,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE ); m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
// m_text->SetBackgroundColour("wheat"); // m_text->SetBackgroundColour("wheat");
//delete wxLog::SetActiveTarget(new wxLogStderr); //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, wxPoint(0,0), wxSize(200,150) );
@ -1151,6 +1154,9 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
MyPanel::~MyPanel() MyPanel::~MyPanel()
{ {
//wxLog::RemoveTraceMask(_T("focus"));
delete wxLog::SetActiveTarget(m_logTargetOld);
delete m_notebook->GetImageList(); delete m_notebook->GetImageList();
} }
@ -1265,11 +1271,11 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
wxString msg; wxString msg;
msg.Printf( msg.Printf(
#ifdef __WXMSW__ #ifdef __WXMSW__
_T("Focus: wxWindow = %p, HWND = %08x"), _T("Focus: %s, HWND = %08x"),
#else #else
_T("Focus: wxWindow = %p"), _T("Focus: %s"),
#endif #endif
s_windowFocus s_windowFocus->GetClassInfo()->GetClassName()
#ifdef __WXMSW__ #ifdef __WXMSW__
, s_windowFocus->GetHWND() , s_windowFocus->GetHWND()
#endif #endif

18
samples/minimal/minimal.cpp
View File

@ -165,24 +165,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// ... and attach this menu bar to the frame // ... and attach this menu bar to the frame
SetMenuBar(menuBar); SetMenuBar(menuBar);
wxPanel *panel = new wxPanel(this, -1);
wxStaticBox *box = new wxStaticBox(panel, -1, "box");
wxComboBox *combo = new wxComboBox(panel, -1, "combo");
wxLayoutConstraints *c;
c = new wxLayoutConstraints;
c->left.SameAs(panel, wxLeft);
c->right.SameAs(panel, wxRight);
c->top.SameAs(panel, wxTop);
c->bottom.SameAs(panel, wxBottom);
box->SetConstraints(c);
c = new wxLayoutConstraints;
c->left.SameAs(box, wxLeft, 20);
c->right.SameAs(box, wxRight, 10);
c->top.SameAs(box, wxTop, 10);
c->bottom.SameAs(box, wxBottom, 10);
combo->SetConstraints(c);
panel->SetAutoLayout(TRUE);
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only) // create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2); CreateStatusBar(2);