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

Source cleaning, wxW headers, whitespaces and improved PCH support.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-06 15:50:42 +00:00
parent be66f18ee1
commit bfeed34c1c
1 changed files with 103 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
samples/aui/auidemo.cpp
View File

@@ -4,7 +4,7 @@
// Author: Benjamin I. Williams
// Modified by:
// Created: 2005-10-03
// RCS-ID:
// RCS-ID: $Id$
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1
///////////////////////////////////////////////////////////////////////////////
@@ -13,12 +13,7 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/log.h"
#pragma hdrstop
#endif
#include "wx/wx.h"
@@ -28,7 +23,6 @@
#include "wx/artprov.h"
#include "wx/clipbrd.h"
#include "wx/image.h"
#include "wx/imaglist.h"
#include "wx/colordlg.h"
#include "wx/wxhtml.h"
@@ -142,7 +136,7 @@ class wxSizeReportCtrl : public wxControl
{
public:
wxSizeReportCtrl(wxWindow* parent, wxWindowID id = -1,
wxSizeReportCtrl(wxWindow* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
wxFrameManager* mgr = NULL)
@@ -153,7 +147,7 @@ public:
private:
void OnPaint(wxPaintEvent& evt)
void OnPaint(wxPaintEvent& WXUNUSED(evt))
{
wxPaintDC dc(this);
wxSize size = GetClientSize();
@@ -195,12 +189,12 @@ private:
}
}
void OnEraseBackground(wxEraseEvent& evt)
void OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
{
// intentionally empty
}
void OnSize(wxSizeEvent& evt)
void OnSize(wxSizeEvent& WXUNUSED(evt))
{
Refresh();
}
@@ -244,7 +238,7 @@ class SettingsPanel : public wxPanel
public:
SettingsPanel(wxWindow* parent, MyFrame* frame)
: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
{
//wxBoxSizer* vert = new wxBoxSizer(wxVERTICAL);
@@ -253,7 +247,7 @@ public:
wxBoxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
m_border_size = new wxSpinCtrl(this, ID_PaneBorderSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
s1->Add(1, 1, 1, wxEXPAND);
s1->Add(new wxStaticText(this, -1, wxT("Pane Border Size:")));
s1->Add(new wxStaticText(this, wxID_ANY, wxT("Pane Border Size:")));
s1->Add(m_border_size);
s1->Add(1, 1, 1, wxEXPAND);
s1->SetItemMinSize((size_t)1, 180, 20);
@@ -262,7 +256,7 @@ public:
wxBoxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
m_sash_size = new wxSpinCtrl(this, ID_SashSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
s2->Add(1, 1, 1, wxEXPAND);
s2->Add(new wxStaticText(this, -1, wxT("Sash Size:")));
s2->Add(new wxStaticText(this, wxID_ANY, wxT("Sash Size:")));
s2->Add(m_sash_size);
s2->Add(1, 1, 1, wxEXPAND);
s2->SetItemMinSize((size_t)1, 180, 20);
@@ -271,7 +265,7 @@ public:
wxBoxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
m_caption_size = new wxSpinCtrl(this, ID_CaptionSize, wxEmptyString, wxDefaultPosition, wxSize(50,20));
s3->Add(1, 1, 1, wxEXPAND);
s3->Add(new wxStaticText(this, -1, wxT("Caption Size:")));
s3->Add(new wxStaticText(this, wxID_ANY, wxT("Caption Size:")));
s3->Add(m_caption_size);
s3->Add(1, 1, 1, wxEXPAND);
s3->SetItemMinSize((size_t)1, 180, 20);
@@ -285,7 +279,7 @@ public:
wxBoxSizer* s4 = new wxBoxSizer(wxHORIZONTAL);
m_background_color = new wxBitmapButton(this, ID_BackgroundColor, b, wxDefaultPosition, wxSize(50,25));
s4->Add(1, 1, 1, wxEXPAND);
s4->Add(new wxStaticText(this, -1, wxT("Background Color:")));
s4->Add(new wxStaticText(this, wxID_ANY, wxT("Background Color:")));
s4->Add(m_background_color);
s4->Add(1, 1, 1, wxEXPAND);
s4->SetItemMinSize((size_t)1, 180, 20);
@@ -293,7 +287,7 @@ public:
wxBoxSizer* s5 = new wxBoxSizer(wxHORIZONTAL);
m_sash_color = new wxBitmapButton(this, ID_SashColor, b, wxDefaultPosition, wxSize(50,25));
s5->Add(1, 1, 1, wxEXPAND);
s5->Add(new wxStaticText(this, -1, wxT("Sash Color:")));
s5->Add(new wxStaticText(this, wxID_ANY, wxT("Sash Color:")));
s5->Add(m_sash_color);
s5->Add(1, 1, 1, wxEXPAND);
s5->SetItemMinSize((size_t)1, 180, 20);
@@ -301,7 +295,7 @@ public:
wxBoxSizer* s6 = new wxBoxSizer(wxHORIZONTAL);
m_inactive_caption_color = new wxBitmapButton(this, ID_InactiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
s6->Add(1, 1, 1, wxEXPAND);
s6->Add(new wxStaticText(this, -1, wxT("Normal Caption:")));
s6->Add(new wxStaticText(this, wxID_ANY, wxT("Normal Caption:")));
s6->Add(m_inactive_caption_color);
s6->Add(1, 1, 1, wxEXPAND);
s6->SetItemMinSize((size_t)1, 180, 20);
@@ -309,7 +303,7 @@ public:
wxBoxSizer* s7 = new wxBoxSizer(wxHORIZONTAL);
m_inactive_caption_gradient_color = new wxBitmapButton(this, ID_InactiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
s7->Add(1, 1, 1, wxEXPAND);
s7->Add(new wxStaticText(this, -1, wxT("Normal Caption Gradient:")));
s7->Add(new wxStaticText(this, wxID_ANY, wxT("Normal Caption Gradient:")));
s7->Add(m_inactive_caption_gradient_color);
s7->Add(1, 1, 1, wxEXPAND);
s7->SetItemMinSize((size_t)1, 180, 20);
@@ -317,7 +311,7 @@ public:
wxBoxSizer* s8 = new wxBoxSizer(wxHORIZONTAL);
m_inactive_caption_text_color = new wxBitmapButton(this, ID_InactiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
s8->Add(1, 1, 1, wxEXPAND);
s8->Add(new wxStaticText(this, -1, wxT("Normal Caption Text:")));
s8->Add(new wxStaticText(this, wxID_ANY, wxT("Normal Caption Text:")));
s8->Add(m_inactive_caption_text_color);
s8->Add(1, 1, 1, wxEXPAND);
s8->SetItemMinSize((size_t)1, 180, 20);
@@ -325,7 +319,7 @@ public:
wxBoxSizer* s9 = new wxBoxSizer(wxHORIZONTAL);
m_active_caption_color = new wxBitmapButton(this, ID_ActiveCaptionColor, b, wxDefaultPosition, wxSize(50,25));
s9->Add(1, 1, 1, wxEXPAND);
s9->Add(new wxStaticText(this, -1, wxT("Active Caption:")));
s9->Add(new wxStaticText(this, wxID_ANY, wxT("Active Caption:")));
s9->Add(m_active_caption_color);
s9->Add(1, 1, 1, wxEXPAND);
s9->SetItemMinSize((size_t)1, 180, 20);
@@ -333,7 +327,7 @@ public:
wxBoxSizer* s10 = new wxBoxSizer(wxHORIZONTAL);
m_active_caption_gradient_color = new wxBitmapButton(this, ID_ActiveCaptionGradientColor, b, wxDefaultPosition, wxSize(50,25));
s10->Add(1, 1, 1, wxEXPAND);
s10->Add(new wxStaticText(this, -1, wxT("Active Caption Gradient:")));
s10->Add(new wxStaticText(this, wxID_ANY, wxT("Active Caption Gradient:")));
s10->Add(m_active_caption_gradient_color);
s10->Add(1, 1, 1, wxEXPAND);
s10->SetItemMinSize((size_t)1, 180, 20);
@@ -341,7 +335,7 @@ public:
wxBoxSizer* s11 = new wxBoxSizer(wxHORIZONTAL);
m_active_caption_text_color = new wxBitmapButton(this, ID_ActiveCaptionTextColor, b, wxDefaultPosition, wxSize(50,25));
s11->Add(1, 1, 1, wxEXPAND);
s11->Add(new wxStaticText(this, -1, wxT("Active Caption Text:")));
s11->Add(new wxStaticText(this, wxID_ANY, wxT("Active Caption Text:")));
s11->Add(m_active_caption_text_color);
s11->Add(1, 1, 1, wxEXPAND);
s11->SetItemMinSize((size_t)1, 180, 20);
@@ -349,7 +343,7 @@ public:
wxBoxSizer* s12 = new wxBoxSizer(wxHORIZONTAL);
m_border_color = new wxBitmapButton(this, ID_BorderColor, b, wxDefaultPosition, wxSize(50,25));
s12->Add(1, 1, 1, wxEXPAND);
s12->Add(new wxStaticText(this, -1, wxT("Border Color:")));
s12->Add(new wxStaticText(this, wxID_ANY, wxT("Border Color:")));
s12->Add(m_border_color);
s12->Add(1, 1, 1, wxEXPAND);
s12->SetItemMinSize((size_t)1, 180, 20);
@@ -357,7 +351,7 @@ public:
wxBoxSizer* s13 = new wxBoxSizer(wxHORIZONTAL);
m_gripper_color = new wxBitmapButton(this, ID_GripperColor, b, wxDefaultPosition, wxSize(50,25));
s13->Add(1, 1, 1, wxEXPAND);
s13->Add(new wxStaticText(this, -1, wxT("Gripper Color:")));
s13->Add(new wxStaticText(this, wxID_ANY, wxT("Gripper Color:")));
s13->Add(m_gripper_color);
s13->Add(1, 1, 1, wxEXPAND);
s13->SetItemMinSize((size_t)1, 180, 20);
@@ -654,7 +648,7 @@ MyFrame::MyFrame(wxWindow* parent,
SetMinSize(wxSize(400,300));
// create some toolbars
wxToolBar* tb1 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
wxToolBar* tb1 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_NODIVIDER);
tb1->SetToolBitmapSize(wxSize(48,48));
tb1->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
@@ -667,7 +661,7 @@ MyFrame::MyFrame(wxWindow* parent,
wxToolBar* tb2 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
wxToolBar* tb2 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_NODIVIDER);
tb2->SetToolBitmapSize(wxSize(16,16));
@@ -687,7 +681,7 @@ MyFrame::MyFrame(wxWindow* parent,
tb2->Realize();
wxToolBar* tb3 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
wxToolBar* tb3 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_NODIVIDER);
tb3->SetToolBitmapSize(wxSize(16,16));
wxBitmap tb3_bmp1 = wxArtProvider::GetBitmap(wxART_FOLDER, wxART_OTHER, wxSize(16,16));
@@ -702,7 +696,7 @@ MyFrame::MyFrame(wxWindow* parent,
wxToolBar* tb4 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
wxToolBar* tb4 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_NODIVIDER | wxTB_HORZ_TEXT);
tb4->SetToolBitmapSize(wxSize(16,16));
wxBitmap tb4_bmp1 = wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_OTHER, wxSize(16,16));
@@ -718,7 +712,7 @@ MyFrame::MyFrame(wxWindow* parent,
tb4->Realize();
// create some toolbars
wxToolBar* tb5 = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize,
wxToolBar* tb5 = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_NODIVIDER | wxTB_VERTICAL);
tb5->SetToolBitmapSize(wxSize(48,48));
tb5->AddTool(101, wxT("Test"), wxArtProvider::GetBitmap(wxART_ERROR));
@@ -826,7 +820,7 @@ MyFrame::MyFrame(wxWindow* parent,
GripperTop().
TopDockable(false).BottomDockable(false));
m_mgr.AddPane(new wxButton(this, -1, _("Test Button")),
m_mgr.AddPane(new wxButton(this, wxID_ANY, _("Test Button")),
wxPaneInfo().Name(wxT("tb5")).
ToolbarPane().Top().Row(2).Position(1).
LeftDockable(false).RightDockable(false));
@@ -882,7 +876,7 @@ void MyFrame::OnSize(wxSizeEvent& event)
event.Skip();
}
void MyFrame::OnSettings(wxCommandEvent& event)
void MyFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
{
// show the settings pane, and float it
wxPaneInfo& floating_pane = m_mgr.GetPane(wxT("settings")).Float().Show();
@@ -913,7 +907,7 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
{
unsigned int flag = 0;
#ifndef __WXMSW__
#ifndef __WXMSW__
if (event.GetId() == ID_TransparentDrag ||
event.GetId() == ID_TransparentHint ||
event.GetId() == ID_TransparentHintFade)
@@ -921,7 +915,7 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
wxMessageBox(wxT("This option is presently only available on wxMSW"));
return;
}
#endif
#endif
switch (event.GetId())
{
@@ -965,7 +959,7 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
}
}
void MyFrame::OnCreatePerspective(wxCommandEvent& event)
void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
{
wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
wxT("wxAUI Test"));
@@ -983,7 +977,7 @@ void MyFrame::OnCreatePerspective(wxCommandEvent& event)
m_perspectives.Add(m_mgr.SavePerspective());
}
void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& event)
void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(event))
{
wxString s = m_mgr.SavePerspective();
@@ -1008,7 +1002,7 @@ wxPoint MyFrame::GetStartPosition()
return wxPoint(pt.x + x, pt.y + x);
}
void MyFrame::OnCreateTree(wxCommandEvent& event)
void MyFrame::OnCreateTree(wxCommandEvent& WXUNUSED(event))
{
m_mgr.AddPane(CreateTreeCtrl(), wxPaneInfo().
Name(wxT("Test")).Caption(wxT("Tree Control")).
@@ -1017,7 +1011,7 @@ void MyFrame::OnCreateTree(wxCommandEvent& event)
m_mgr.Update();
}
void MyFrame::OnCreateGrid(wxCommandEvent& event)
void MyFrame::OnCreateGrid(wxCommandEvent& WXUNUSED(event))
{
m_mgr.AddPane(CreateGrid(), wxPaneInfo().
Name(wxT("Test")).Caption(wxT("Grid")).
@@ -1026,7 +1020,7 @@ void MyFrame::OnCreateGrid(wxCommandEvent& event)
m_mgr.Update();
}
void MyFrame::OnCreateHTML(wxCommandEvent& event)
void MyFrame::OnCreateHTML(wxCommandEvent& WXUNUSED(event))
{
m_mgr.AddPane(CreateHTMLCtrl(), wxPaneInfo().
Name(wxT("Test")).Caption(wxT("Grid")).
@@ -1035,7 +1029,7 @@ void MyFrame::OnCreateHTML(wxCommandEvent& event)
m_mgr.Update();
}
void MyFrame::OnCreateText(wxCommandEvent& event)
void MyFrame::OnCreateText(wxCommandEvent& WXUNUSED(event))
{
m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
Name(wxT("Test")).Caption(wxT("Text Control")).
@@ -1043,7 +1037,7 @@ void MyFrame::OnCreateText(wxCommandEvent& event)
m_mgr.Update();
}
void MyFrame::OnCreateSizeReport(wxCommandEvent& event)
void MyFrame::OnCreateSizeReport(wxCommandEvent& WXUNUSED(event))
{
m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
Name(wxT("Test")).Caption(wxT("Client Size Reporter")).
@@ -1078,7 +1072,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl()
text.Printf(wxT("This is text box %d"), ++n);
return new wxTextCtrl(this,-1, text,
return new wxTextCtrl(this,wxID_ANY, text,
wxPoint(0,0), wxSize(150,90),
wxNO_BORDER | wxTE_MULTILINE);
}
@@ -1086,7 +1080,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl()
wxGrid* MyFrame::CreateGrid()
{
wxGrid* grid = new wxGrid(this, -1,
wxGrid* grid = new wxGrid(this, wxID_ANY,
wxPoint(0,0),
wxSize(150,250),
wxNO_BORDER | wxWANTS_CHARS);
@@ -1096,7 +1090,7 @@ wxGrid* MyFrame::CreateGrid()
wxTreeCtrl* MyFrame::CreateTreeCtrl()
{
wxTreeCtrl* tree = new wxTreeCtrl(this, -1,
wxTreeCtrl* tree = new wxTreeCtrl(this, wxID_ANY,
wxPoint(0,0), wxSize(160,250),
wxTR_DEFAULT_STYLE | wxNO_BORDER);
@@ -1135,7 +1129,7 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl()
wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
{
wxSizeReportCtrl* ctrl = new wxSizeReportCtrl(this, -1,
wxSizeReportCtrl* ctrl = new wxSizeReportCtrl(this, wxID_ANY,
wxDefaultPosition,
wxSize(width, height), &m_mgr);
return ctrl;
@@ -1143,7 +1137,7 @@ wxSizeReportCtrl* MyFrame::CreateSizeReportCtrl(int width, int height)
wxHtmlWindow* MyFrame::CreateHTMLCtrl()
{
wxHtmlWindow* ctrl = new wxHtmlWindow(this, -1,
wxHtmlWindow* ctrl = new wxHtmlWindow(this, wxID_ANY,
wxDefaultPosition,
wxSize(400,300));
ctrl->SetPage(GetIntroText());