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

No changes whatsoever, just remove trailing whitespace.

Browse Source 
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-09-30 11:44:45 +00:00
parent 6255fac96f
commit ce00f59b5b
155 changed files with 708 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
samples/access/accesstest.cpp
View File

@@ -431,7 +431,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
accessibleFrame->Release();
return;
}
long obtained = 0;
VARIANT *var = new VARIANT[childCount];
@@ -441,7 +441,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
VariantInit(& (var[i]));
var[i].vt = VT_DISPATCH;
}
if (S_OK == AccessibleChildren(accessibleFrame, 0, childCount, var, &obtained))
{
for (i = 0; i < childCount; i++)
@@ -452,7 +452,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
if (var[i].pdispVal->QueryInterface(IID_IAccessible, (LPVOID*) & childAccessible) == S_OK)
{
var[i].pdispVal->Release();
wxString name, role;
GetInfo(childAccessible, 0, name, role);
wxString str;
@@ -565,10 +565,10 @@ void MyFrame::GetInfo(IAccessible* accessible, int id, wxString& name, wxString&
VariantInit(& var);
var.vt = VT_I4;
var.lVal = id;
BSTR bStrName = 0;
HRESULT hResult = accessible->get_accName(var, & bStrName);
if (hResult == S_OK)
{
name = wxConvertStringFromOle(bStrName);
@@ -578,23 +578,23 @@ void MyFrame::GetInfo(IAccessible* accessible, int id, wxString& name, wxString&
{
name = wxT("NO NAME");
}
VARIANT varRole;
VariantInit(& varRole);
hResult = accessible->get_accRole(var, & varRole);
if (hResult == S_OK && varRole.vt == VT_I4)
{
wxChar buf[256];
GetRoleText(varRole.lVal, buf, 256);
role = buf;
}
else
{
role = wxT("NO ROLE");
}
}
}
/*
@@ -717,14 +717,14 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
return wxACC_FALSE;
}
break;
case wxNAVDIR_LASTCHILD:
{
if (fromId == 2)
return wxACC_FALSE;
}
break;
case wxNAVDIR_LEFT:
{
if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL)
@@ -748,7 +748,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_NEXT:
{
if (fromId == 1)
@@ -769,7 +769,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_PREVIOUS:
{
if (fromId == 3)
@@ -790,7 +790,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_RIGHT:
{
if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL)
@@ -809,13 +809,13 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
}
}
// Can't go right spatially if split horizontally.
return wxACC_FALSE;
return wxACC_FALSE;
}
#if 0
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_UP:
{
if (splitter->GetSplitMode() != wxSPLIT_VERTICAL)
@@ -834,14 +834,14 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
}
// Can't go up spatially if split vertically.
return wxACC_FALSE;
return wxACC_FALSE;
#if 0
// below line is not executed due to earlier return
break;
#endif
}
}
}
// Let the framework handle the other cases.
return wxACC_NOT_IMPLEMENTED;

4
samples/caret/caret.cpp
View File

@@ -226,7 +226,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
m_canvas = new MyCanvas(this);
#if wxUSE_STATUSBAR
@@ -413,7 +413,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxPaintDC dc( this );
PrepareDC( dc );
dc.Clear();
dc.SetFont( m_font );
for ( int y = 0; y < m_yChars; y++ )

6
samples/console/console.cpp
View File

@@ -16,10 +16,10 @@
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
// kill the last '\n'
input[wxStrlen(input) - 1] = 0;
if (wxStrcmp(input, "quit") == 0)
break;

12
samples/dataview/dataview.cpp
View File

@@ -294,7 +294,7 @@ enum
ID_ADD_MANY = 203,
ID_HIDE_ATTRIBUTES = 204,
ID_SHOW_ATTRIBUTES = 205,
// Fourth page.
ID_DELETE_TREE_ITEM = 400,
ID_DELETE_ALL_TREE_ITEMS = 401,
@@ -360,9 +360,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
#endif // wxUSE_DRAG_AND_DROP
EVT_RIGHT_UP(MyFrame::OnRightClick)
EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnAttrHeaderClick)
END_EVENT_TABLE()
MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h):
@@ -626,8 +626,8 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
m_ctrl[1]->AppendIconTextColumn("icon",
MyListModel::Col_IconText,
wxDATAVIEW_CELL_EDITABLE);
m_attributes =
m_attributes =
new wxDataViewColumn("attributes",
new wxDataViewTextRenderer,
MyListModel::Col_TextWithAttr,
@@ -1195,7 +1195,7 @@ void MyFrame::OnDeleteTreeItem(wxCommandEvent& WXUNUSED(event))
wxDataViewItem selected = ctrl->GetSelection();
if (!selected.IsOk())
return;
ctrl->DeleteItem(selected);
}

2
samples/dataview/mymodels.cpp
View File

@@ -348,7 +348,7 @@ void MyListModel::Prepend( const wxString &text )
void MyListModel::DeleteItem( const wxDataViewItem &item )
{
unsigned int row = GetRow( item );
if (row >= m_textColValues.GetCount())
return;

12
samples/dialogs/dialogs.cpp
View File

@@ -809,7 +809,7 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
wxCENTER |
wxNO_DEFAULT | wxYES_NO | wxCANCEL |
wxICON_INFORMATION);
wxString extmsg;
if ( dialog.SetYesNoCancelLabels
(
@@ -827,21 +827,21 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
"so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used.";
}
dialog.SetExtendedMessage(extmsg);
switch ( dialog.ShowModal() )
{
case wxID_YES:
wxLogStatus(wxT("You pressed \"Yes\""));
break;
case wxID_NO:
wxLogStatus(wxT("You pressed \"No\""));
break;
case wxID_CANCEL:
wxLogStatus(wxT("You pressed \"Cancel\""));
break;
default:
wxLogError(wxT("Unexpected wxMessageDialog return code!"));
}
@@ -2695,7 +2695,7 @@ bool TestMessageBoxDialog::Create()
};
wxCOMPILE_TIME_ASSERT( WXSIZEOF(icons) == MsgDlgIcon_Max, IconMismatch );
m_icons = new wxRadioBox(this, wxID_ANY, "&Icon style",
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(icons), icons,

2
samples/docview/doc.h
View File

@@ -166,7 +166,7 @@ class wxTextDocument : public wxDocument
public:
wxTextDocument() : wxDocument() { }
virtual bool OnCreate(const wxString& path, long flags);
virtual bool OnCreate(const wxString& path, long flags);
virtual wxTextCtrl* GetTextCtrl() const = 0;

2
samples/docview/view.cpp
View File

@@ -88,7 +88,7 @@ void DrawingView::OnDraw(wxDC *dc)
++i )
{
const DoodleLines& lines = i->GetLines();
for ( DoodleLines::const_iterator j = lines.begin();
for ( DoodleLines::const_iterator j = lines.begin();
j != lines.end();
++j )
{

6
samples/dragimag/dragimag.cpp
View File

@@ -142,7 +142,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
m_currentlyHighlighted = (DragShape*) NULL;
m_draggedShape = (DragShape*) NULL;
Refresh(true);
}
else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE)
@@ -230,7 +230,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (mustUnhighlightOld || mustHighlightNew)
m_dragImage->Hide();
// Now with the drag image switched off, we can change the window contents.
if (mustUnhighlightOld)
m_currentlyHighlighted = (DragShape*) NULL;
@@ -475,7 +475,7 @@ bool DragShape::Draw(wxDC& dc, bool highlight)
dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),
& memDC, 0, 0, wxCOPY, true);
if (highlight)
{
dc.SetPen(*wxWHITE_PEN);

4
samples/flash/flash.cpp
View File

@@ -21,9 +21,9 @@
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif

44
samples/font/font.cpp
View File

@@ -102,10 +102,10 @@ public:
void OnBold(wxCommandEvent& event);
void OnLight(wxCommandEvent& event);
void OnItalic(wxCommandEvent& event);
void OnSlant(wxCommandEvent& event);
void OnUnderline(wxCommandEvent& event);
void OnwxPointerFont(wxCommandEvent& event);
@@ -123,7 +123,7 @@ public:
void OnSetNativeDesc(wxCommandEvent& event);
void OnSetNativeUserDesc(wxCommandEvent& event);
void OnSetFamily(wxCommandEvent& event);
void OnSetFaceName(wxCommandEvent& event);
void OnSetEncoding(wxCommandEvent& event);
@@ -164,21 +164,21 @@ enum
// menu items
Font_Quit = wxID_EXIT,
Font_About = wxID_ABOUT,
Font_ViewMsg = wxID_HIGHEST+1,
Font_TestTextValue,
Font_IncSize,
Font_DecSize,
Font_Bold,
Font_Light,
Font_Italic,
Font_Slant,
Font_Underlined,
// standard global wxFont objects:
Font_wxNORMAL_FONT,
Font_wxSMALL_FONT,
@@ -223,13 +223,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Font_IncSize, MyFrame::OnIncFont)
EVT_MENU(Font_DecSize, MyFrame::OnDecFont)
EVT_MENU(Font_Bold, MyFrame::OnBold)
EVT_MENU(Font_Light, MyFrame::OnLight)
EVT_MENU(Font_Italic, MyFrame::OnItalic)
EVT_MENU(Font_Slant, MyFrame::OnSlant)
EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
EVT_MENU(Font_wxNORMAL_FONT, MyFrame::OnwxPointerFont)
@@ -339,7 +339,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
wxT("Set &user font description\tShift-Ctrl-U"));
menuFont->AppendSeparator();
menuFont->Append(Font_SetFamily, wxT("Set font family"));
menuFont->Append(Font_SetFaceName, wxT("Set font face name"));
menuFont->Append(Font_SetFaceName, wxT("Set font face name"));
menuFont->Append(Font_SetEncoding, wxT("Set font &encoding\tShift-Ctrl-E"));
wxMenu *menuSelect = new wxMenu;
@@ -354,21 +354,21 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts);
wxMenu *menuSettingFonts = new wxMenu;
menuSettingFonts->Append(Font_wxSYS_OEM_FIXED_FONT, wxT("wxSYS_OEM_FIXED_FONT"),
menuSettingFonts->Append(Font_wxSYS_OEM_FIXED_FONT, wxT("wxSYS_OEM_FIXED_FONT"),
wxT("Original equipment manufacturer dependent fixed-pitch font."));
menuSettingFonts->Append(Font_wxSYS_ANSI_FIXED_FONT, wxT("wxSYS_ANSI_FIXED_FONT"),
menuSettingFonts->Append(Font_wxSYS_ANSI_FIXED_FONT, wxT("wxSYS_ANSI_FIXED_FONT"),
wxT("Windows fixed-pitch (monospaced) font. "));
menuSettingFonts->Append(Font_wxSYS_ANSI_VAR_FONT, wxT("wxSYS_ANSI_VAR_FONT"),
menuSettingFonts->Append(Font_wxSYS_ANSI_VAR_FONT, wxT("wxSYS_ANSI_VAR_FONT"),
wxT("Windows variable-pitch (proportional) font."));
menuSettingFonts->Append(Font_wxSYS_SYSTEM_FONT, wxT("wxSYS_SYSTEM_FONT"),
menuSettingFonts->Append(Font_wxSYS_SYSTEM_FONT, wxT("wxSYS_SYSTEM_FONT"),
wxT("System font."));
menuSettingFonts->Append(Font_wxSYS_DEVICE_DEFAULT_FONT, wxT("wxSYS_DEVICE_DEFAULT_FONT"),
wxT("Device-dependent font."));
menuSettingFonts->Append(Font_wxSYS_DEFAULT_GUI_FONT, wxT("wxSYS_DEFAULT_GUI_FONT"),
menuSettingFonts->Append(Font_wxSYS_DEFAULT_GUI_FONT, wxT("wxSYS_DEFAULT_GUI_FONT"),
wxT("Default font for user interface objects such as menus and dialog boxes. "));
menuSelect->Append(Font_SystemSettings, wxT("System fonts"), menuSettingFonts);
menuSelect->AppendSeparator();
menuSelect->Append(Font_EnumFamilies, wxT("Enumerate font &families\tCtrl-F"));
menuSelect->Append(Font_EnumFixedFamilies,
@@ -821,12 +821,12 @@ void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
{
mbar->Check(Font_Light, font.GetWeight() == wxFONTWEIGHT_LIGHT);
mbar->Check(Font_Bold, font.GetWeight() == wxFONTWEIGHT_BOLD);
mbar->Check(Font_Italic, font.GetStyle() == wxFONTSTYLE_ITALIC);
#ifndef __WXMSW__
mbar->Check(Font_Slant, font.GetStyle() == wxFONTSTYLE_SLANT);
#endif
mbar->Check(Font_Underlined, font.GetUnderlined());
}
}
@@ -1023,7 +1023,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
// output the font name/info
wxString fontInfo;
fontInfo.Printf(wxT("Face name: %s, family: %s"),
m_font.GetFaceName().c_str(),
m_font.GetFamilyString().c_str());

4
samples/help/demo.cpp
View File

@@ -461,10 +461,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
m_embeddedHelpWindow = new wxHtmlHelpWindow;
// m_embeddedHtmlHelp.UseConfig(config, rootPath); // Can set your own config object here
m_embeddedHtmlHelp.SetHelpWindow(m_embeddedHelpWindow);
m_embeddedHelpWindow->Create(this,
wxID_ANY, wxDefaultPosition, GetClientSize(), wxTAB_TRAVERSAL|wxNO_BORDER, wxHF_DEFAULT_STYLE);
m_embeddedHtmlHelp.AddBook(wxFileName(wxT("doc.zip")));
m_embeddedHtmlHelp.Display(wxT("Introduction"));
#else

6
samples/layout/expt.cpp
View File

@@ -4,9 +4,9 @@
* the original, so abandoned.
Example:
wxConstrain(frame->panel,
( leftOf (frame->panel) = leftOf (frame),
topOf (frame->panel) = topOf (frame),
rightOf (frame->panel) = rightOf (frame),
@@ -70,7 +70,7 @@ class wxConstraintOp: public wxObject
wxConstraintOp operator = (const wxConstraintOp& arg2);
wxConstraintOp operator = (const int value);
friend wxConstraintOp operator % (const int perCent, const wxConstraintOp& arg2);
friend wxConstraintOp operator + (wxConstraintOp& arg1, int margin);
friend wxConstraintOp operator - (wxConstraintOp& arg1, int margin);

8
samples/layout/layout.h
View File

@@ -103,10 +103,10 @@ class MySimpleSizerFrame : public wxFrame
{
public:
MySimpleSizerFrame(const wxString &title, int x, int y );
void OnSetSmallSize( wxCommandEvent &event);
void OnSetBigSize( wxCommandEvent &event);
private:
wxTextCtrl *m_target;
@@ -121,8 +121,8 @@ class MyNestedSizerFrame : public wxFrame
{
public:
MyNestedSizerFrame(const wxString &title, int x, int y );
private:
wxTextCtrl *m_target;
};

2
samples/listctrl/listtest.cpp
View File

@@ -283,7 +283,7 @@ MyFrame::MyFrame(const wxChar *title)
#ifdef __WXMSW__
// this is useful to know specially when debugging :)
wxLogMessage("Your version of comctl32.dll is: %d",
wxLogMessage("Your version of comctl32.dll is: %d",
wxApp::GetComCtl32Version());
#endif

2
samples/mfc/mfctest.cpp
View File

@@ -39,7 +39,7 @@
// nmake -f makefile.vc BUILD=debug SHARED=0 DEBUG_RUNTIME_LIBS=0 RUNTIME_LIBS=static all
//
// Unless the run-time library settings match for wxWidgets and MFC, you
// will get link errors for symbols such as __mbctype, __argc, and __argv
// will get link errors for symbols such as __mbctype, __argc, and __argv
//
// (3) If you see bogus memory leaks within the MSVC IDE on exit, in this
// sample or in your own project, you must be using __WXDEBUG__ +

2
samples/mfc/resource.h
View File

@@ -6,7 +6,7 @@
#define IDM_TEST 101
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS

4
samples/minimal/minimal.cpp
View File

@@ -16,10 +16,10 @@
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif

2
samples/nativdlg/resource.h
View File

@@ -14,7 +14,7 @@
#define IDC_STATIC -1
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102

10
samples/notebook/notebook.cpp
View File

@@ -89,14 +89,14 @@ wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *parent)
panel->SetHelpText( wxT( "Panel with some Radio Buttons" ) );
#endif
wxString animals[] =
wxString animals[] =
{ wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
wxT("Sabre-toothed tiger"), wxT("T Rex") };
wxRadioBox *radiobox1 = new wxRadioBox(panel, wxID_ANY, wxT("Choose one"),
wxDefaultPosition, wxDefaultSize, 5, animals, 2, wxRA_SPECIFY_ROWS);
wxString computers[] =
wxString computers[] =
{ wxT("Amiga"), wxT("Commodore 64"), wxT("PET"),
wxT("Another") };
@@ -121,7 +121,7 @@ wxPanel *CreateVetoPage(wxBookCtrlBase *parent)
#endif
(void) new wxStaticText( panel, wxID_ANY,
wxT("This page intentionally left blank"),
wxT("This page intentionally left blank"),
wxPoint(10, 10) );
return panel;
@@ -154,7 +154,7 @@ wxPanel *CreateInsertPage(wxBookCtrlBase *parent)
panel->SetBackgroundColour( wxColour( wxT("MAROON") ) );
(void) new wxStaticText( panel, wxID_ANY,
wxT("This page has been inserted, not added."),
wxT("This page has been inserted, not added."),
wxPoint(10, 10) );
return panel;
@@ -579,7 +579,7 @@ void MyFrame::RecreateBook()
m_sizerFrame->Layout();
}
void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
const wxChar * flagName) const
{
if( (flags & flag) == flag )

2
samples/opengl/cube/cube.cpp
View File

@@ -161,7 +161,7 @@ TestGLContext::TestGLContext(wxGLCanvas *canvas)
const wxImage img(DrawDice(256, i + 1));
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img.GetWidth(), img.GetHeight(),
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img.GetWidth(), img.GetHeight(),
0, GL_RGB, GL_UNSIGNED_BYTE, img.GetData());
}

2
samples/opengl/isosurf/isosurf.cpp
View File

@@ -232,7 +232,7 @@ void TestGLCanvas::LoadSurface(const wxString& filename)
wxLogMessage(wxT("Loaded %d vertices, %d triangles from '%s'"),
m_numverts, m_numverts-2, filename.c_str());
// NOTE: for some reason under wxGTK the following is required to avoid that
// the surface gets rendered in a small rectangle in the top-left corner of the frame
PostSizeEventToParent();

2
samples/propgrid/propgrid.cpp
View File

@@ -1646,7 +1646,7 @@ void FormMain::PopulateWithExamples ()
mdc.DrawLine(0, 0, 60, 15);
mdc.SelectObject(wxNullBitmap);
pg->SetPropertyImage( wxT("StringPropertyWithBitmap"), myTestBitmap );
// this value array would be optional if values matched string indexes
//long flags_prop_values[] = { wxICONIZE, wxCAPTION, wxMINIMIZE_BOX, wxMAXIMIZE_BOX };

2
samples/propgrid/tests.cpp
View File

@@ -1131,7 +1131,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
InitPanel();
const int trySplitterPos = 50;
int style = wxPG_AUTO_SORT; // wxPG_SPLITTER_AUTO_CENTER;
pgman = m_pPropGridManager =
new wxPropertyGridManager(m_panel, wxID_ANY,

12
samples/ribbon/ribbondemo.cpp
View File

@@ -249,18 +249,18 @@ MyFrame::MyFrame()
shapes->AddButton(ID_SQUARE, wxT("Square"), wxBitmap(square_xpm), wxEmptyString);
shapes->AddDropdownButton(ID_POLYGON, wxT("Other Polygon"), wxBitmap(hexagon_xpm), wxEmptyString);
wxRibbonPanel *sizer_panel = new wxRibbonPanel(home, wxID_ANY, wxT("Panel with Sizer"),
wxNullBitmap, wxDefaultPosition, wxDefaultSize,
wxRibbonPanel *sizer_panel = new wxRibbonPanel(home, wxID_ANY, wxT("Panel with Sizer"),
wxNullBitmap, wxDefaultPosition, wxDefaultSize,
wxRIBBON_PANEL_EXT_BUTTON);
wxArrayString as;
as.Add("Item 1");
as.Add("Item 2");
wxComboBox* sizer_panelcombo = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxComboBox* sizer_panelcombo = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, as, wxCB_READONLY);
wxComboBox* sizer_panelcombo2 = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxComboBox* sizer_panelcombo2 = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, as, wxCB_READONLY);
sizer_panelcombo->SetMinSize(wxSize(150, -1));
sizer_panelcombo2->SetMinSize(wxSize(150, -1));
@@ -360,7 +360,7 @@ wxRibbonGallery* MyFrame::PopulateColoursPanel(wxWindow* panel,
else
gallery = new wxRibbonGallery(panel, gallery_id);
wxMemoryDC& dc = m_bitmap_creation_dc;
wxRibbonGalleryItem *def_item =
wxRibbonGalleryItem *def_item =
AddColourToGallery(gallery, wxT("Default"), dc, &def);
gallery->SetSelection(def_item);
AddColourToGallery(gallery, wxT("BLUE"), dc);

6
samples/sockets/baseclient.cpp
View File

@@ -306,9 +306,9 @@ Client::OnExit()
return 0;
}
// Create buffer to be sent by client. Buffer contains test indicator
// Create buffer to be sent by client. Buffer contains test indicator
// message size and place for data
// msgsize parameter contains size of data in bytes and
// msgsize parameter contains size of data in bytes and
// if input value does not fit into 250 bytes then
// on exit is updated to new value that is multiply of 1024 bytes
char*
@@ -318,7 +318,7 @@ Client::CreateBuffer(int* msgsize)
char* buf;
//if message should have more than 256 bytes then set it as
//test3 for compatibility with GUI server sample
if ((*msgsize) > 250)
if ((*msgsize) > 250)
{
//send at least one kb of data
int size = (*msgsize)/1024 + 1;

2
samples/stc/edit.h
View File

@@ -48,7 +48,7 @@ public:
Edit (wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style =
long style =
#ifndef __WXMAC__
wxSUNKEN_BORDER|
#endif

22
samples/svg/svgtest.cpp
View File

@@ -66,29 +66,29 @@ public:
void OnNewWindow(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event);
void FileSavePicture (wxCommandEvent& event);
unsigned int GetCountOfChildren() const
{ return m_nWinCreated; }
private:
unsigned int m_nWinCreated;
DECLARE_EVENT_TABLE()
};
class MyChild: public wxMDIChildFrame
{
public:
MyChild(wxMDIParentFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
MyChild(wxMDIParentFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE);
~MyChild();
void OnActivate(wxActivateEvent& event);
void OnQuit(wxCommandEvent& event);
bool OnSave(wxString filename);
MyFrame* GetFrame()
{ return m_frame; }
@@ -108,7 +108,7 @@ public:
private:
int m_index;
MyChild* m_child;
DECLARE_EVENT_TABLE()
};
@@ -213,7 +213,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
(void)wxMessageBox(wxT("wxWidgets SVG sample\n")
wxT("Author: Chris Elliott (c) 2002-2009\n")
wxT("Usage: click File|New to show tests"),
wxT("Usage: click File|New to show tests"),
wxT("About SVG Test"));
}
@@ -224,7 +224,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
wxString title;
title.Printf(wxT("SVG Test Window %d"), m_nWinCreated );
// counts number of children previously, even if now closed
m_nWinCreated ++;
@@ -519,14 +519,14 @@ MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
: wxMDIChildFrame(parent, wxID_ANY, title, pos, size, style)
{
m_frame = (MyFrame *) parent;
#if wxUSE_STATUSBAR
CreateStatusBar();
SetStatusText(title);
#endif // wxUSE_STATUSBAR
m_canvas = new MyCanvas(this, wxPoint(0, 0), GetClientSize());
// Give it scrollbars
m_canvas->SetScrollbars(20, 20, 50, 50);
}

2
samples/toolbar/toolbar.cpp
View File

@@ -642,7 +642,7 @@ MyFrame::MyFrame(wxFrame* parent,
m_extraToolBar = new wxToolBar(m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_TEXT|wxTB_FLAT|wxTB_TOP);
PopulateToolbar(m_extraToolBar);
#endif
m_textWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);

6
samples/treectrl/treetest.cpp
View File

@@ -807,7 +807,7 @@ void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event))
{
m_treeCtrl->SetSpacing( indent-5 );
m_treeCtrl->Refresh();
}
}
}
void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
@@ -1024,10 +1024,10 @@ void MyTreeCtrl::CreateStateImageList(bool del)
wxIcon icons[2];
icons[0] = wxIcon(unchecked_xpm);
icons[1] = wxIcon(checked_xpm);
int width = icons[0].GetWidth(),
height = icons[0].GetHeight();
// Make an state image list containing small icons
states = new wxImageList(width, height, true);

2
samples/widgets/gauge.cpp
View File

@@ -303,7 +303,7 @@ void GaugeWidgetsPage::CreateGauge()
wxDefaultPosition, wxDefaultSize,
flags);
m_gauge->SetValue(val);
if ( flags & wxGA_VERTICAL )
m_sizerGauge->Add(m_gauge, 0, wxGROW | wxALL, 5);
else

18
samples/widgets/searchctrl.cpp
View File

@@ -5,7 +5,7 @@
// Author: Robin Dunn
// Created: 9-Dec-2006
// Id: $Id$
// Copyright: (c) 2006
// Copyright: (c) 2006
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -87,14 +87,14 @@ protected:
void OnSearch(wxCommandEvent& event);
wxMenu* CreateTestMenu();
// (re)create the control
void CreateControl();
// reset the control parameters
void Reset();
wxSearchCtrl* m_srchCtrl;
wxCheckBox* m_searchBtnCheck;
wxCheckBox* m_cancelBtnCheck;
@@ -153,7 +153,7 @@ void SearchCtrlWidgetsPage::CreateContent()
m_menuBtnCheck = new wxCheckBox(this, ID_MENU_CB, wxT("Search menu"));
m_searchBtnCheck->SetValue(true);
box->Add(m_searchBtnCheck, 0, wxALL, 5);
box->Add(m_cancelBtnCheck, 0, wxALL, 5);
box->Add(m_menuBtnCheck, 0, wxALL, 5);
@@ -171,13 +171,13 @@ void SearchCtrlWidgetsPage::CreateControl()
m_srchCtrl->Destroy();
int style = 0;
m_srchCtrl = new wxSearchCtrl(this, -1, wxEmptyString, wxDefaultPosition,
wxSize(150, -1), style);
}
void SearchCtrlWidgetsPage::Reset()
{
{
}
@@ -193,7 +193,7 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
wxString tipText = wxString::Format(wxT("tip %i"),i);
menu->Append(ID_SEARCHMENU+i, itemText, tipText, wxITEM_NORMAL);
}
// target->Connect(
// target->Connect(
// ID_SEARCHMENU,
// ID_SEARCHMENU+SEARCH_MENU_SIZE,
// wxEVT_COMMAND_MENU_SELECTED,
@@ -215,7 +215,7 @@ void SearchCtrlWidgetsPage::OnToggleSearchButton(wxCommandEvent&)
void SearchCtrlWidgetsPage::OnToggleCancelButton(wxCommandEvent&)
{
m_srchCtrl->ShowCancelButton( m_cancelBtnCheck->GetValue() );
}
void SearchCtrlWidgetsPage::OnToggleSearchMenu(wxCommandEvent&)