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

Leftover changes for sample doc improvements in ticket #9582 (most of the patch was applied already in r54310).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2008-06-21 06:13:20 +00:00
parent 9602ce3d8c
commit 57b2bba406
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/doxygen/Doxyfile_inc
View File

@@ -167,12 +167,14 @@ ALIASES += endWxPythonOnly="\endif"
ALIASES += leftCurly="{" ALIASES += leftCurly="{"
ALIASES += rightCurly="}" ALIASES += rightCurly="}"
# Sample documentation related aliases
# For indicating the a directory containing a sample # For indicating the a directory containing a sample
ALIASES += sampledir{1}="\verbatim Location: samples/\1\endverbatim" ALIASES += sampledir{1}="\verbatim Location: samples/\1\endverbatim"
# For refering to a sample introduction in a class document or a overview # For refering to the corresponding sample in a class document or a overview
# Usually placed in the queue of @see # Usually placed in the queue of @see
ALIASES += sample{1}="\ref page_samples_\1" ALIASES += sample{1}="\ref page_samples_\1"
# For generating a general description for a sample by associating it with a class # For generating a general description for a sample
# \1 could be a class or an overview or a descriptive sentence
# Shall be replaced by manual written description soon # Shall be replaced by manual written description soon
ALIASES += sampleabout{1}="This sample demonstrates \1." ALIASES += sampleabout{1}="This sample demonstrates \1."
# For indicating the necessary condition of a sample or a class # For indicating the necessary condition of a sample or a class

12
samples/popup/popup.cpp
View File

@@ -116,7 +116,7 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent )
m_panel = new wxScrolledWindow( this, wxID_ANY ); m_panel = new wxScrolledWindow( this, wxID_ANY );
m_panel->SetBackgroundColour( *wxLIGHT_GREY ); m_panel->SetBackgroundColour( *wxLIGHT_GREY );
// Keep this code to verify if mouse events work, they're required if // Keep this code to verify if mouse events work, they're required if
// you're making a control like a combobox where the items are highlighted // you're making a control like a combobox where the items are highlighted
// under the cursor, the m_panel is set focus in the Popup() function // under the cursor, the m_panel is set focus in the Popup() function
m_panel->Connect(wxEVT_MOTION, m_panel->Connect(wxEVT_MOTION,
@@ -133,7 +133,7 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent )
m_button = new wxButton(m_panel, Minimal_PopupButton, wxT("Press Me")); m_button = new wxButton(m_panel, Minimal_PopupButton, wxT("Press Me"));
m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello")); m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello"));
m_mouseText = new wxStaticText(m_panel, wxID_ANY, m_mouseText = new wxStaticText(m_panel, wxID_ANY,
wxT("<- Test Mouse ->")); wxT("<- Test Mouse ->"));
wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
@@ -200,9 +200,10 @@ void SimpleTransientPopup::OnMouse(wxMouseEvent &event)
wxColour colour(*wxLIGHT_GREY); wxColour colour(*wxLIGHT_GREY);
if (rect.Contains(event.GetPosition())) if (rect.Contains(event.GetPosition()))
{ {
colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnMouse pos(%d, %d)"), long(event.GetEventObject()), event.GetX(), event.GetY()); wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnMouse pos(%d, %d)"),
long(event.GetEventObject()), event.GetX(), event.GetY());
} }
if (colour != m_mouseText->GetBackgroundColour()) if (colour != m_mouseText->GetBackgroundColour())
@@ -228,7 +229,8 @@ void SimpleTransientPopup::OnButton(wxCommandEvent& event)
void SimpleTransientPopup::OnSpinCtrl(wxSpinEvent& event) void SimpleTransientPopup::OnSpinCtrl(wxSpinEvent& event)
{ {
wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSpinCtrl ID %d Value %d"), long(this), event.GetId(), event.GetInt()); wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSpinCtrl ID %d Value %d"),
long(this), event.GetId(), event.GetInt());
event.Skip(); event.Skip();
} }