Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a proper log frame to the propgrid sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-12-12 09:59:20 +00:00
parent 5405bfb439
commit 9d136b8b50
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
samples/propgrid/propgrid.cpp
View File

@@ -1033,7 +1033,7 @@ void FormMain::OnPropertyGridPageChange( wxPropertyGridEvent& WXUNUSED(event) )
void FormMain::OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event ) void FormMain::OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event )
{ {
wxLogDebug("wxPG_EVT_LABEL_EDIT_BEGIN(%s)", wxLogMessage("wxPG_EVT_LABEL_EDIT_BEGIN(%s)",
event.GetProperty()->GetLabel().c_str()); event.GetProperty()->GetLabel().c_str());
} }
@@ -1041,7 +1041,7 @@ void FormMain::OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event )
void FormMain::OnPropertyGridLabelEditEnding( wxPropertyGridEvent& event ) void FormMain::OnPropertyGridLabelEditEnding( wxPropertyGridEvent& event )
{ {
wxLogDebug("wxPG_EVT_LABEL_EDIT_ENDING(%s)", wxLogMessage("wxPG_EVT_LABEL_EDIT_ENDING(%s)",
event.GetProperty()->GetLabel().c_str()); event.GetProperty()->GetLabel().c_str());
} }
@@ -1121,14 +1121,14 @@ void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& )
void FormMain::OnPropertyGridItemCollapse( wxPropertyGridEvent& ) void FormMain::OnPropertyGridItemCollapse( wxPropertyGridEvent& )
{ {
wxLogDebug(wxT("Item was Collapsed")); wxLogMessage(wxT("Item was Collapsed"));
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void FormMain::OnPropertyGridItemExpand( wxPropertyGridEvent& ) void FormMain::OnPropertyGridItemExpand( wxPropertyGridEvent& )
{ {
wxLogDebug(wxT("Item was Expanded")); wxLogMessage(wxT("Item was Expanded"));
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -1137,12 +1137,12 @@ void FormMain::OnPropertyGridColBeginDrag( wxPropertyGridEvent& event )
{ {
if ( m_itemVetoDragging->IsChecked() ) if ( m_itemVetoDragging->IsChecked() )
{ {
wxLogDebug("Splitter %i resize was vetoed", event.GetColumn()); wxLogMessage("Splitter %i resize was vetoed", event.GetColumn());
event.Veto(); event.Veto();
} }
else else
{ {
wxLogDebug("Splitter %i resize began", event.GetColumn()); wxLogMessage("Splitter %i resize began", event.GetColumn());
} }
} }
@@ -1150,15 +1150,16 @@ void FormMain::OnPropertyGridColBeginDrag( wxPropertyGridEvent& event )
void FormMain::OnPropertyGridColDragging( wxPropertyGridEvent& event ) void FormMain::OnPropertyGridColDragging( wxPropertyGridEvent& event )
{ {
wxUnusedVar(event);
// For now, let's not spam the log output // For now, let's not spam the log output
//wxLogDebug("Splitter %i is being resized", event.GetColumn()); //wxLogMessage("Splitter %i is being resized", event.GetColumn());
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void FormMain::OnPropertyGridColEndDrag( wxPropertyGridEvent& event ) void FormMain::OnPropertyGridColEndDrag( wxPropertyGridEvent& event )
{ {
wxLogDebug("Splitter %i resize ended", event.GetColumn()); wxLogMessage("Splitter %i resize ended", event.GetColumn());
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -2339,6 +2340,14 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
FinalizeFramePosition(); FinalizeFramePosition();
#if wxUSE_LOGWINDOW
// Create log window
m_logWindow = new wxLogWindow(this, "Log Messages", false);
m_logWindow->GetFrame()->Move(GetPosition().x + GetSize().x + 10,
GetPosition().y);
m_logWindow->Show();
#endif
} }
void FormMain::FinalizeFramePosition() void FormMain::FinalizeFramePosition()

4
samples/propgrid/propgrid.h
View File

@@ -139,6 +139,10 @@ public:
wxWindow* m_panel; wxWindow* m_panel;
wxBoxSizer* m_topSizer; wxBoxSizer* m_topSizer;
#if wxUSE_LOGWINDOW
wxLogWindow* m_logWindow;
#endif
wxPGEditor* m_pSampleMultiButtonEditor; wxPGEditor* m_pSampleMultiButtonEditor;
wxPGChoices m_combinedFlags; wxPGChoices m_combinedFlags;