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

More name changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-05-25 11:20:37 +00:00
parent c663fbea68
commit be5a51fb59
267 changed files with 676 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/include/wx/deprecated/tbarsmpl.h
View File

@@ -25,7 +25,7 @@
class WXDLLEXPORT wxMemoryDC; class WXDLLEXPORT wxMemoryDC;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxToolBarSimple is a generic toolbar implementation in pure wxWindows // wxToolBarSimple is a generic toolbar implementation in pure wxWidgets
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_DEPRECATED wxToolBarSimple : public wxToolBarBase class WXDLLIMPEXP_DEPRECATED wxToolBarSimple : public wxToolBarBase

2
contrib/include/wx/mmedia/vidbase.h
View File

@@ -27,7 +27,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/stream.h" #include "wx/stream.h"

2
contrib/include/wx/mmedia/vidwin.h
View File

@@ -30,7 +30,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #include "wx/string.h"
#include "wx/stream.h" #include "wx/stream.h"

2
contrib/include/wx/mmedia/vidxanm.h
View File

@@ -26,7 +26,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/string.h" #include "wx/string.h"

2
contrib/include/wx/net/email.h
View File

@@ -32,7 +32,7 @@ public:
//// Operations //// Operations
// Send a message. // Send a message.
// Specify profile, or leave it to wxWindows to find the current user name // Specify profile, or leave it to wxWidgets to find the current user name
static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString, static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString,
const wxString& sendMail = wxT("/usr/lib/sendmail -t")); const wxString& sendMail = wxT("/usr/lib/sendmail -t"));

2
contrib/include/wx/stc/stc.h
View File

@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Name: stc.h // Name: stc.h
// Purpose: A wxWindows implementation of Scintilla. This class is the // Purpose: A wxWidgets implementation of Scintilla. This class is the
// one meant to be used directly by wx applications. It does not // one meant to be used directly by wx applications. It does not
// derive directly from the Scintilla classes, and in fact there // derive directly from the Scintilla classes, and in fact there
// is no mention of Scintilla classes at all in this header. // is no mention of Scintilla classes at all in this header.

10
contrib/include/wx/xrc/xmlres.h
View File

@@ -59,7 +59,7 @@ class wxXmlResourceModule;
// older versions of the library may ignore it. // older versions of the library may ignore it.
// - if you change version number, follow these steps: // - if you change version number, follow these steps:
// - set major, minor and release numbers to respective version numbers of // - set major, minor and release numbers to respective version numbers of
// the wxWindows library (see wx/version.h) // the wxWidgets library (see wx/version.h)
// - reset revision to 0 unless the first three are same as before, // - reset revision to 0 unless the first three are same as before,
// in which case you should increase revision by one // in which case you should increase revision by one
#define WX_XMLRES_CURRENT_VERSION_MAJOR 2 #define WX_XMLRES_CURRENT_VERSION_MAJOR 2
@@ -127,7 +127,7 @@ public:
// Initialize handlers for all supported controls/windows. This will // Initialize handlers for all supported controls/windows. This will
// make the executable quite big because it forces linking against // make the executable quite big because it forces linking against
// most of the wxWindows library. // most of the wxWidgets library.
void InitAllHandlers(); void InitAllHandlers();
// Initialize only a specific handler (or custom handler). Convention says // Initialize only a specific handler (or custom handler). Convention says
@@ -274,7 +274,7 @@ private:
// This macro translates string identifier (as used in XML resource, // This macro translates string identifier (as used in XML resource,
// e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
// wxWindows event tables. // wxWidgets event tables.
// Example: // Example:
// BEGIN_EVENT_TABLE(MyFrame, wxFrame) // BEGIN_EVENT_TABLE(MyFrame, wxFrame)
// EVT_MENU(XRCID("quit"), MyFrame::OnQuit) // EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
@@ -463,9 +463,9 @@ WXDLLIMPEXP_XRC void wxXmlInitResourceModule();
// This class is used to create instances of XRC "object" nodes with "subclass" // This class is used to create instances of XRC "object" nodes with "subclass"
// property. It is _not_ supposed to be used by XRC users, you should instead // property. It is _not_ supposed to be used by XRC users, you should instead
// register your subclasses via wxWindows' RTTI mechanism. This class is useful // register your subclasses via wxWidgets' RTTI mechanism. This class is useful
// only for language bindings developer who need a way to implement subclassing // only for language bindings developer who need a way to implement subclassing
// in wxWindows ports that don't support wxRTTI (e.g. wxPython). // in wxWidgets ports that don't support wxRTTI (e.g. wxPython).
class WXDLLIMPEXP_XRC wxXmlSubclassFactory class WXDLLIMPEXP_XRC wxXmlSubclassFactory
{ {
public: public:

2
contrib/samples/animate/anitest.cpp
View File

@@ -139,7 +139,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{ {
(void)wxMessageBox(_T("wxWindows 2 Animation Demo\n") (void)wxMessageBox(_T("wxWidgets 2 Animation Demo\n")
_T("Author: Julian Smart (c) 2001\n"), _T("Author: Julian Smart (c) 2001\n"),
_T("About Animation Demo")); _T("About Animation Demo"));
} }

10
contrib/samples/deprecated/resource/resource.cpp
View File

@@ -41,7 +41,7 @@
// If we wanted to demonstrate total platform independence, // If we wanted to demonstrate total platform independence,
// then we'd use the dynamic file loading form for all platforms. // then we'd use the dynamic file loading form for all platforms.
// But this shows how to embed the wxWindows resources // But this shows how to embed the wxWidgets resources
// in the program code/executable for UNIX and Windows // in the program code/executable for UNIX and Windows
// platforms. // platforms.
@@ -104,7 +104,7 @@ bool MyApp::OnInit(void)
// Create the main frame window // Create the main frame window
frame = new MyFrame( (wxFrame *) NULL, -1, frame = new MyFrame( (wxFrame *) NULL, -1,
wxT("wxWindows Resource Sample"), wxT("wxWidgets Resource Sample"),
wxPoint(-1, -1), wxSize(300, 250) ); wxPoint(-1, -1), wxSize(300, 250) );
// Give it a status line // Give it a status line
@@ -172,8 +172,8 @@ MyFrame::MyFrame
void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
{ {
wxMessageBox(wxT("wxWindows resource sample.\n") wxMessageBox(wxT("wxWidgets resource sample.\n")
wxT("(c) Julian Smart"), wxT("About wxWindows sample"), wxT("(c) Julian Smart"), wxT("About wxWidgets sample"),
wxICON_INFORMATION | wxOK); wxICON_INFORMATION | wxOK);
} }
@@ -191,7 +191,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog); wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
if (text) if (text)
{ {
text->SetValue(wxT("wxWindows resource demo")); text->SetValue(wxT("wxWidgets resource demo"));
} }
dialog->ShowModal(); dialog->ShowModal();

2
contrib/samples/deprecated/treelay/treelay.cpp
View File

@@ -185,7 +185,7 @@ void MyFrame::OnTopBottom(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{ {
(void)wxMessageBox(_T("wxWindows tree library demo Vsn 2.0\nAuthor: Julian Smart (c) 1998"), _T("About tree test")); (void)wxMessageBox(_T("wxWidgets tree library demo Vsn 2.0\nAuthor: Julian Smart (c) 1998"), _T("About tree test"));
} }
void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

2
contrib/samples/fl/fl_demo1.cpp
View File

@@ -124,7 +124,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
} }
MyFrame::MyFrame(wxFrame *frame) MyFrame::MyFrame(wxFrame *frame)
: wxFrame( frame, -1, _("wxWindows 2.0 wxFrameLayout Test Application"), wxDefaultPosition, : wxFrame( frame, -1, _("wxWidgets 2.0 wxFrameLayout Test Application"), wxDefaultPosition,
wxSize( 700, 500 ), wxSize( 700, 500 ),
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION, wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,

8
contrib/samples/fl/fl_demo2.cpp
View File

@@ -24,7 +24,7 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
// wxWindows headers. // wxWidgets headers.
#include "wx/treectrl.h" #include "wx/treectrl.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/notebook.h" #include "wx/notebook.h"
@@ -55,7 +55,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, _("wxWindows 2.0 wxFrameLayout demo"), 50, 50, 650, 540); MyFrame *frame = new MyFrame(NULL, _("wxWidgets 2.0 wxFrameLayout demo"), 50, 50, 650, 540);
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WINDOWS__
@@ -170,7 +170,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h
mpInternalFrm = (wxPanel*)this; mpInternalFrm = (wxPanel*)this;
mAboutBox.Create( this, -1, _T("About box in wxWindows style..."), mAboutBox.Create( this, -1, _T("About box in wxWidgets style..."),
wxDefaultPosition, wxDefaultPosition,
wxSize( 385,220), wxSize( 385,220),
wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL ); wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL );
@@ -665,7 +665,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
pClassView->SetImageList( &mImageList ); pClassView->SetImageList( &mImageList );
wxTreeItemId rootId = pClassView->AddRoot( wxT("wxWindows 2.0 classes"), 0 ); wxTreeItemId rootId = pClassView->AddRoot( wxT("wxWidgets 2.0 classes"), 0 );
pClassView->AppendItem( rootId, _("wxWin Dynamic classes (grabbed at run-time)"), 0 ); pClassView->AppendItem( rootId, _("wxWin Dynamic classes (grabbed at run-time)"), 0 );
pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"), 0 ); pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"), 0 );

2
contrib/samples/fl/fl_sample1.cpp
View File

@@ -67,7 +67,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// wxWindows boiler-plate: // wxWidgets boiler-plate:
MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample")); MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));

2
contrib/samples/fl/fl_sample2.cpp
View File

@@ -68,7 +68,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// wxWindows boiler-plate: // wxWidgets boiler-plate:
MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample")); MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));

2
contrib/samples/fl/fl_sample3.cpp
View File

@@ -72,7 +72,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
// wxWindows boiler-plate: // wxWidgets boiler-plate:
MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample")); MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));

2
contrib/samples/gizmos/dynsash/dynsash.cpp
View File

@@ -18,7 +18,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

2
contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
View File

@@ -20,7 +20,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

2
contrib/samples/gizmos/editlbox/test.cpp
View File

@@ -6,7 +6,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

10
contrib/samples/gizmos/led/led.cpp
View File

@@ -25,7 +25,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -91,7 +91,7 @@ public:
private: private:
MyPanel *m_panel; MyPanel *m_panel;
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -123,10 +123,10 @@ enum
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the event tables connect the wxWindows events with the functions (event // the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the // handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler. // simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -141,7 +141,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(LED_About, MyFrame::OnAbout) EVT_MENU(LED_About, MyFrame::OnAbout)
END_EVENT_TABLE() END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create // Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a // the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function // static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and // wxGetApp() which will return the reference of the right type (i.e. MyApp and

10
contrib/samples/gizmos/splittree/tree.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: tree.cpp // Name: tree.cpp
// Purpose: Minimal wxWindows sample // Purpose: Minimal wxWidgets sample
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 04/01/98 // Created: 04/01/98
@@ -29,7 +29,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -103,10 +103,10 @@ static char * icon2_xpm[] = {
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the event tables connect the wxWindows events with the functions (event // the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the // handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler. // simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -114,7 +114,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_About, MyFrame::OnAbout) EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE() END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create // Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a // the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function // static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and // wxGetApp() which will return the reference of the right type (i.e. MyApp and

2
contrib/samples/gizmos/splittree/tree.h
View File

@@ -49,7 +49,7 @@ protected:
TestValueWindow* m_valueWindow; TestValueWindow* m_valueWindow;
private: private:
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

2
contrib/samples/mmedia/mmbman.cpp
View File

@@ -25,7 +25,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

12
contrib/samples/mmedia/mmboard.cpp
View File

@@ -28,7 +28,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -91,7 +91,7 @@ public:
void CloseVideoWindow(); void CloseVideoWindow();
private: private:
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
@@ -132,7 +132,7 @@ enum
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame) BEGIN_EVENT_TABLE(MMBoardFrame, wxFrame)
@@ -274,7 +274,7 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
#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(3); CreateStatusBar(3);
SetStatusText(wxT("Welcome to wxWindows!")); SetStatusText(wxT("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
// Misc variables // Misc variables
@@ -398,8 +398,8 @@ void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{ {
wxString msg; wxString msg;
msg.Printf( wxT("wxWindows Multimedia board v1.0a, wxMMedia v2.0a:\n") msg.Printf( wxT("wxWidgets Multimedia board v1.0a, wxMMedia v2.0a:\n")
wxT("an example of the capabilities of the wxWindows multimedia classes.\n") wxT("an example of the capabilities of the wxWidgets multimedia classes.\n")
wxT("Copyright 1999, 2000, Guilhem Lavaux.\n")); wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this); wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);

2
contrib/samples/ogl/studio/mainfrm.cpp
View File

@@ -186,7 +186,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
// window doesn't cause the proper refresh. Just refreshing the // window doesn't cause the proper refresh. Just refreshing the
// client doesn't work (presumably because it's clipping the // client doesn't work (presumably because it's clipping the
// children). // children).
// FIXED in wxWindows, by intercepting wxMDIClientWindow::DoSetSize // FIXED in wxWidgets, by intercepting wxMDIClientWindow::DoSetSize
// and checking if the position has changed, before redrawing the // and checking if the position has changed, before redrawing the
// child windows. // child windows.
#if 0 #if 0

6
contrib/samples/ogl/studio/studio.cpp
View File

@@ -161,7 +161,7 @@ bool csApp::OnInit(void)
frame->SetMenuBar(menuBar); frame->SetMenuBar(menuBar);
// Load the file history // Load the file history
wxConfig config(_T("OGL Studio"), _T("wxWindows")); wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
m_docManager->FileHistoryLoad(config); m_docManager->FileHistoryLoad(config);
frame->CreateStatusBar(); frame->CreateStatusBar();
@@ -491,7 +491,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
// Read/write configuration information // Read/write configuration information
bool csApp::ReadOptions() bool csApp::ReadOptions()
{ {
wxConfig config(_T("OGL Studio"), _T("wxWindows")); wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
config.Read(_T("mainX"), & m_mainFramePos.x); config.Read(_T("mainX"), & m_mainFramePos.x);
config.Read(_T("mainY"), & m_mainFramePos.y); config.Read(_T("mainY"), & m_mainFramePos.y);
@@ -505,7 +505,7 @@ bool csApp::ReadOptions()
bool csApp::WriteOptions() bool csApp::WriteOptions()
{ {
wxConfig config(_T("OGL Studio"), _T("wxWindows")); wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
config.Write(_T("mainX"), (long) m_mainFramePos.x); config.Write(_T("mainX"), (long) m_mainFramePos.x);
config.Write(_T("mainY"), (long) m_mainFramePos.y); config.Write(_T("mainY"), (long) m_mainFramePos.y);

2
contrib/samples/stc/defsext.h
View File

@@ -15,7 +15,7 @@
// headers // headers
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//! wxWindows headers //! wxWidgets headers
#include <wx/print.h> // printing support #include <wx/print.h> // printing support
#include <wx/printdlg.h> // printing dialog #include <wx/printdlg.h> // printing dialog

4
contrib/samples/stc/edit.cpp
View File

@@ -25,12 +25,12 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all 'standard' wxWindows headers) // need because it includes almost all 'standard' wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
//! wxWindows headers //! wxWidgets headers
#include <wx/file.h> // raw file io support #include <wx/file.h> // raw file io support
#include <wx/filename.h> // filename support #include <wx/filename.h> // filename support

4
contrib/samples/stc/edit.h
View File

@@ -20,9 +20,9 @@
// headers // headers
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//! wxWindows headers //! wxWidgets headers
//! wxWindows/contrib headers //! wxWidgets/contrib headers
#include <wx/stc/stc.h> // styled text control #include <wx/stc/stc.h> // styled text control
//! application headers //! application headers

6
contrib/samples/stc/prefs.cpp
View File

@@ -20,14 +20,14 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all 'standard' wxWindows headers) // need because it includes almost all 'standard' wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
//! wxWindows headers //! wxWidgets headers
//! wxWindows/contrib headers //! wxWidgets/contrib headers
//! application headers //! application headers
#include "defsext.h" // Additional definitions #include "defsext.h" // Additional definitions

4
contrib/samples/stc/prefs.h
View File

@@ -20,9 +20,9 @@
// headers // headers
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//! wxWindows headers //! wxWidgets headers
//! wxWindows/contrib headers //! wxWidgets/contrib headers
#include <wx/stc/stc.h> // styled text control #include <wx/stc/stc.h> // styled text control
//! application headers //! application headers

12
contrib/samples/stc/stctest.cpp
View File

@@ -20,12 +20,12 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all 'standard' wxWindows headers) // need because it includes almost all 'standard' wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
//! wxWindows headers //! wxWidgets headers
#include <wx/config.h> // configuration support #include <wx/config.h> // configuration support
#include <wx/filedlg.h> // file dialog support #include <wx/filedlg.h> // file dialog support
#include <wx/filename.h> // filename support #include <wx/filename.h> // filename support
@@ -57,14 +57,14 @@
#define APP_DESCR _("See http://wxguide.sourceforge.net/") #define APP_DESCR _("See http://wxguide.sourceforge.net/")
#define APP_MAINT _T("Otto Wyss") #define APP_MAINT _T("Otto Wyss")
#define APP_VENDOR _T("wxWindows") #define APP_VENDOR _T("wxWidgets")
#define APP_COPYRIGTH _T("(C) 2003 Otto Wyss") #define APP_COPYRIGTH _T("(C) 2003 Otto Wyss")
#define APP_LICENCE _T("wxWindows") #define APP_LICENCE _T("wxWidgets")
#define APP_VERSION _T("0.1.alpha") #define APP_VERSION _T("0.1.alpha")
#define APP_BUILD __DATE__ #define APP_BUILD __DATE__
#define APP_WEBSITE _T("http://www.wxWindows.org") #define APP_WEBSITE _T("http://www.wxWidgets.org")
#define APP_MAIL _T("mailto://???") #define APP_MAIL _T("mailto://???")
#define NONAME _("<untitled>") #define NONAME _("<untitled>")
@@ -99,7 +99,7 @@ private:
}; };
// created dynamically by wxWindows // created dynamically by wxWidgets
DECLARE_APP (App); DECLARE_APP (App);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
contrib/samples/svg/svgtest.cpp
View File

@@ -252,7 +252,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{ {
(void)wxMessageBox(wxT("wxWindows 2.0 SVG 1.0 Test\n") (void)wxMessageBox(wxT("wxWidgets 2.0 SVG 1.0 Test\n")
wxT("Author: Chris Elliott (c) 2002\n") wxT("Author: Chris Elliott (c) 2002\n")
wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test")); wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
} }

6
contrib/samples/xrc/custclas.cpp
View File

@@ -16,7 +16,7 @@
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Standard wxWindows headers // Standard wxWidgets headers
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
#endif #endif
// For all others, include the necessary headers (this file is usually all you // For all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -62,7 +62,7 @@ enum {
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxWindows macro: implement dynamic class // wxWidgets macro: implement dynamic class
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl ) IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl )

14
contrib/samples/xrc/custclas.h
View File

@@ -35,8 +35,8 @@
//! A custom listctrl that resizes itself and pops up a context-sensitive menu. //! A custom listctrl that resizes itself and pops up a context-sensitive menu.
class MyResizableListCtrl : public wxListCtrl class MyResizableListCtrl : public wxListCtrl
{ {
// Very helpful wxWindows macro required for wxWindows-RTTI tracing: By using this // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this
// you will see "Leaked one object of type myResizeableListCtrl" in the debug log, // you will see "Leaked one object of type myResizeableListCtrl" in the debug log,
// along with which line you if was created, but you forget to free the memory. // along with which line you if was created, but you forget to free the memory.
// NOTE: Using this REQUIRES a default constructor: that means either: giving a // NOTE: Using this REQUIRES a default constructor: that means either: giving a
// default value for all parameters in your constructor, or else having a dummy // default value for all parameters in your constructor, or else having a dummy
@@ -47,14 +47,14 @@ public:
// Constructor. // Constructor.
/* /*
These parameters are the same as a wxWindows constructor. These parameters are the same as a wxWidgets constructor.
\param parent The parent window. \param parent The parent window.
\param id The id of the progress_listbox. Will usually be -1 unless multiple \param id The id of the progress_listbox. Will usually be -1 unless multiple
of them on the same dialog. of them on the same dialog.
\param pos The pixel position of the listctrl on its parent window \param pos The pixel position of the listctrl on its parent window
\param size The pixel size of the listctrl \param size The pixel size of the listctrl
\param style Style of the listbox. See wxWindows wxListBox docs for details. \param style Style of the listbox. See wxWidgets wxListBox docs for details.
\param validator Window validator. See wxWindows docs for details. \param validator Window validator. See wxWidgets docs for details.
\param name Windows name (rarely used). \param name Windows name (rarely used).
\param exclusion_column_caption The label of header of listctrl's exclusion \param exclusion_column_caption The label of header of listctrl's exclusion
column. column.
@@ -76,7 +76,7 @@ protected:
// A custom function for a context sensitive menu. // A custom function for a context sensitive menu.
void ContextSensitiveMenu( wxMouseEvent& event ); void ContextSensitiveMenu( wxMouseEvent& event );
// This is a wxWindows function that we are going to override with our own behaviour. // This is a wxWidgets function that we are going to override with our own behaviour.
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );
// A custom function. What is called in the constructor, and in an OnSize() // A custom function. What is called in the constructor, and in an OnSize()
@@ -84,7 +84,7 @@ protected:
private: private:
// wxWindows macro, required to be able to use Event tables in the .cpp file. // wxWidgets macro, required to be able to use Event tables in the .cpp file.
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

4
contrib/samples/xrc/derivdlg.cpp
View File

@@ -16,7 +16,7 @@
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Standard wxWindows headers // Standard wxWidgets headers
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
#endif #endif
// For all others, include the necessary headers (this file is usually all you // For all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

2
contrib/samples/xrc/derivdlg.h
View File

@@ -59,7 +59,7 @@ private:
// Override base class functions of a wxDialog. // Override base class functions of a wxDialog.
void OnOK( wxCommandEvent &event ); void OnOK( wxCommandEvent &event );
// Any class wishing to process wxWindows events must use this macro // Any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

8
contrib/samples/xrc/myframe.cpp
View File

@@ -16,7 +16,7 @@
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Standard wxWindows headers // Standard wxWidgets headers
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
#endif #endif
// For all others, include the necessary headers (this file is usually all you // For all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -73,14 +73,14 @@
// Event table: connect the events to the handler functions to process them // Event table: connect the events to the handler functions to process them
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// The event tables connect the wxWindows events with the functions (event // The event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the // handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler. // simple menu events like this the static method is much simpler.
// The reason why the menuitems and tools are given the same name in the // The reason why the menuitems and tools are given the same name in the
// XRC file, is that both a tool (a toolbar item) and a menuitem are designed // XRC file, is that both a tool (a toolbar item) and a menuitem are designed
// to fire the same kind of event (an EVT_MENU) and thus I give them the same // to fire the same kind of event (an EVT_MENU) and thus I give them the same
// ID name to help new users emphasize this point which is often overlooked // ID name to help new users emphasize this point which is often overlooked
// when starting out with wxWindows. // when starting out with wxWidgets.
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(XRCID("exit_tool_or_menuitem"), MyFrame::OnExitToolOrMenuCommand) EVT_MENU(XRCID("exit_tool_or_menuitem"), MyFrame::OnExitToolOrMenuCommand)
EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand) EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand)

2
contrib/samples/xrc/myframe.h
View File

@@ -55,7 +55,7 @@ private:
void OnArtProviderToolOrMenuCommand(wxCommandEvent& event); void OnArtProviderToolOrMenuCommand(wxCommandEvent& event);
void OnVariableExpansionToolOrMenuCommand(wxCommandEvent& event); void OnVariableExpansionToolOrMenuCommand(wxCommandEvent& event);
// Any class wishing to process wxWindows events must use this macro // Any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

2
contrib/samples/xrc/rc/artprov.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="art_provider_dialog"> <object class="wxDialog" name="art_provider_dialog">
<title>wxArtProvider Example</title> <title>wxArtProvider Example</title>

2
contrib/samples/xrc/rc/basicdlg.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="non_derived_dialog"> <object class="wxDialog" name="non_derived_dialog">
<title>Non-Derived Dialog Example</title> <title>Non-Derived Dialog Example</title>

2
contrib/samples/xrc/rc/controls.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="controls_dialog"> <object class="wxDialog" name="controls_dialog">
<title>Controls Example</title> <title>Controls Example</title>

4
contrib/samples/xrc/rc/custclas.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="custom_class_dialog"> <object class="wxDialog" name="custom_class_dialog">
<title>Custom Class Example</title> <title>Custom Class Example</title>
@@ -19,7 +19,7 @@
<object class="wxTextCtrl" name="message_textctrl"> <object class="wxTextCtrl" name="message_textctrl">
<size>500,150</size> <size>500,150</size>
<style>wxTE_MULTILINE</style> <style>wxTE_MULTILINE</style>
<value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWindows controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value> <value>You can embed your own custom classes into an XRC file. This is referred to as attaching an unknown control.\n\nThere are 3 main cases when you would want to do this:\n\n(A) Most commonly: you have derived a class from one of the main wxWidgets controls, so that it can manage its own state and look after its own events, because it is better management to have a portable class with all the code for that control in there with the class, instead of being having many event handlers for that control scattered up in its parent dialog (which is allowed, but gets messy if a control has alot of methods). For example, if you require a wxListCtrl that popups a menu when right-clicked on an item, and you want the wxListCtrl to resize its columns in response to an OnSize(), and a few more methods, it makes better sourcecode logic to package all these methods into by a standalone derived wxListCtrl class, instead of having the parent dialog manage all these events and other functions. This is what the example below shows: it does a custom behaviour of resizing its first column to appropriately fill up the width of the control on a resize event, and it pops up a context-menu in response to a left click (and shades out popup menu item appropriately if there is no item currenty selected in the listctrl).\n\n(B)You have an utterly new widget that has no equivalent in the wxWindows class heirarchy, so you thus need to embed your class to get the needed functionality.\n\n(C) You are using one of the rarely used wxWindows controls that doesn't have an XRC handler in the XRC library. However, all of the major controls: wxButton, wxTextCtrl, etc have an XRC handler, so this is pretty rare, and you could always write your own XRC handler for that control if you wanted. You can choose the "Controls example" from the XRC demo menu to see all the controls that have an XRC handler.\n\nThe typical formula for attaching an unknown control is:\n\n(1) If you are deriving your own custom class to be embedded into the XRC, describe that class with its own .cpp and .h file. In this example it is custclass.cpp and custclass.h\n\n(2)Specify an "unknown" tag in the XRC file that you want to embed it into (see the unknown tag in custclass.xrc). This will be the placeholder of the new class.\n\n(3) Load the XRC dialog as usual, but before you show the dialog to the user, construct an instance of your custom control, and then use wxXmlResource::Get()-&gt;AttachUnknownControl() to put the custom class into its "unknown" placeholder in the XRC file.\n\nThe result is what you see below, a custom class control that fits in seemlessly with the whole dialog, the same as if it was read from XRC directly. Try out resizing this dialog, and watch the listctrl column resize, and right-click to call up its popup menu. By the way, if you look at the source of this XRC dialog, you will that this dialog node has a set of style flags that includes wxRESIZE__BORDER--that is why this dialog is resizable, whereas most of the rest of the dialogs in the XRC sample that don't include this tag, are not resizable.</value>
</object> </object>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">

2
contrib/samples/xrc/rc/derivdlg.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="derived_dialog"> <object class="wxDialog" name="derived_dialog">
<title>Derived Dialog Example</title> <title>Derived Dialog Example</title>

4
contrib/samples/xrc/rc/frame.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxFrame" name="main_frame"> <object class="wxFrame" name="main_frame">
<title>XML Resources Demo</title> <title>XML Resources Demo</title>
@@ -18,7 +18,7 @@
<object class="wxTextCtrl" name="message_textctrl"> <object class="wxTextCtrl" name="message_textctrl">
<size>500,280</size> <size>500,280</size>
<style>wxTE_MULTILINE</style> <style>wxTE_MULTILINE</style>
<value>Welcome to the wxWindows XmlResource (XRC) sample! Using wxWindows XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value> <value>Welcome to the wxWidgets XmlResource (XRC) sample! Using wxWidgets XML resources makes your GUI C++ programming much faster and easier.\n\nView the examples under the "Basic" menu to learn how to get up and running with XRC quickly, and later have a look at the examples under the "Advanced" menu for advanced techniques.\n\nThe XML file that described this frame is the sample's frame.xrc file, with the menu in menu.xrc, and the toolbar in toolbar.xrc. The frame XRC file structure is exactly the same as the XRC files for the dialogs, except that the top level node is a wxFrame, not a wxDialog. Each of the other dialog in this example is a separate XRC file, each of which can be examined for how they work.</value>
</object> </object>
</object> </object>
</object> </object>

4
contrib/samples/xrc/rc/menu.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxMenuBar" name="main_menu"> <object class="wxMenuBar" name="main_menu">
<style>wxMB_DOCKABLE</style> <style>wxMB_DOCKABLE</style>
@@ -28,7 +28,7 @@
<object class="wxMenuItem" name="controls_tool_or_menuitem"> <object class="wxMenuItem" name="controls_tool_or_menuitem">
<label>_Controls Example</label> <label>_Controls Example</label>
<bitmap>controls.xpm</bitmap> <bitmap>controls.xpm</bitmap>
<help>A notebook displaying all the wxWindows controls</help> <help>A notebook displaying all the wxWidgets controls</help>
</object> </object>
<object class="wxMenuItem" name="uncentered_tool_or_menuitem"> <object class="wxMenuItem" name="uncentered_tool_or_menuitem">
<label>_Uncentered Example</label> <label>_Uncentered Example</label>

2
contrib/samples/xrc/rc/platform.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="platform_property_dialog"> <object class="wxDialog" name="platform_property_dialog">
<title>Platform Property Example</title> <title>Platform Property Example</title>

2
contrib/samples/xrc/rc/resource.xrc
View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxMenuBar" name="mainmenu"> <object class="wxMenuBar" name="mainmenu">
<style>wxMB_DOCKABLE</style> <style>wxMB_DOCKABLE</style>
<object class="wxMenu" name="menu_file"> <object class="wxMenu" name="menu_file">

4
contrib/samples/xrc/rc/toolbar.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxToolBar" name="main_toolbar"> <object class="wxToolBar" name="main_toolbar">
<style>wxTB_FLAT|wxTB_DOCKABLE</style> <style>wxTB_FLAT|wxTB_DOCKABLE</style>
@@ -18,7 +18,7 @@
<object class="tool" name="controls_tool_or_menuitem"> <object class="tool" name="controls_tool_or_menuitem">
<tooltip>Controls Example</tooltip> <tooltip>Controls Example</tooltip>
<bitmap>controls.xpm</bitmap> <bitmap>controls.xpm</bitmap>
<longhelp>A notebook displaying all the wxWindows controls</longhelp> <longhelp>A notebook displaying all the wxWidgets controls</longhelp>
</object> </object>
<object class="tool" name="uncentered_tool_or_menuitem"> <object class="tool" name="uncentered_tool_or_menuitem">
<tooltip>Uncentered Example</tooltip> <tooltip>Uncentered Example</tooltip>

2
contrib/samples/xrc/rc/uncenter.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="uncentered_dialog"> <object class="wxDialog" name="uncentered_dialog">
<title>Uncentered Example</title> <title>Uncentered Example</title>

2
contrib/samples/xrc/rc/variable.xrc
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
<object class="wxDialog" name="variable_expansion_dialog"> <object class="wxDialog" name="variable_expansion_dialog">
<title>Variable Expansion Example</title> <title>Variable Expansion Example</title>

8
contrib/samples/xrc/xrcdemo.cpp
View File

@@ -16,7 +16,7 @@
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Standard wxWindows headers // Standard wxWidgets headers
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
#endif #endif
// For all others, include the necessary headers (this file is usually all you // For all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -53,10 +53,10 @@
#include "myframe.h" #include "myframe.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxWindows macro: Declare the application. // wxWidgets macro: Declare the application.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Create a new application object: this macro will allow wxWindows to create // Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a // the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function // static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. the_app and // wxGetApp() which will return the reference of the right type (i.e. the_app and

6
contrib/src/deprecated/resource.cpp
View File

@@ -2373,7 +2373,7 @@ long wxParseWindowStyle(const wxString& bitListString)
} }
/* /*
* Load a bitmap from a wxWindows resource, choosing an optimum * Load a bitmap from a wxWidgets resource, choosing an optimum
* depth and appropriate type. * depth and appropriate type.
*/ */
@@ -2527,7 +2527,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
} }
/* /*
* Load an icon from a wxWindows resource, choosing an optimum * Load an icon from a wxWidgets resource, choosing an optimum
* depth and appropriate type. * depth and appropriate type.
*/ */
@@ -2652,7 +2652,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
} }
case wxBITMAP_TYPE_XPM_DATA: case wxBITMAP_TYPE_XPM_DATA:
{ {
// *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS *** // *** XPM ICON NOT YET IMPLEMENTED IN wxWidgets ***
/* /*
wxItemResource *item = table->FindResource(name); wxItemResource *item = table->FindResource(name);
if (!item) if (!item)

2
contrib/src/gizmos/dynamicsash.cpp
View File

@@ -22,7 +22,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

2
contrib/src/gizmos/editlbox.cpp
View File

@@ -19,7 +19,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

2
contrib/src/gizmos/splittree.cpp
View File

@@ -30,7 +30,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

2
contrib/src/mmedia/sndesd.cpp
View File

@@ -44,7 +44,7 @@
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#define MY_ESD_NAME "wxWindows/wxSoundStreamESD" #define MY_ESD_NAME "wxWidgets/wxSoundStreamESD"
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// wxSoundStreamESD: ESD sound driver // wxSoundStreamESD: ESD sound driver

2
contrib/src/mmedia/sndoss.cpp
View File

@@ -24,7 +24,7 @@
#endif #endif
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// wxWindows headers // wxWidgets headers
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/string.h" #include "wx/string.h"

2
contrib/src/net/email.cpp
View File

@@ -40,7 +40,7 @@
#endif #endif
// Send a message. // Send a message.
// Specify profile, or leave it to wxWindows to find the current user name // Specify profile, or leave it to wxWidgets to find the current user name
#ifdef __WXMSW__ #ifdef __WXMSW__
bool wxEmail::Send(wxMailMessage& message, const wxString& profileName, const wxString& WXUNUSED(sendMail)) bool wxEmail::Send(wxMailMessage& message, const wxString& profileName, const wxString& WXUNUSED(sendMail))

2
contrib/src/stc/PlatWX.cpp
View File

@@ -1,5 +1,5 @@
// Scintilla source code edit control // Scintilla source code edit control
// PlatWX.cxx - implementation of platform facilities on wxWindows // PlatWX.cxx - implementation of platform facilities on wxWidgets
// Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org> // Copyright 1998-1999 by Neil Hodgson <neilh@scintilla.org>
// Robin Dunn <robin@aldunn.com> // Robin Dunn <robin@aldunn.com>
// The License.txt file describes the conditions under which this software may be distributed. // The License.txt file describes the conditions under which this software may be distributed.

2
contrib/src/stc/ScintillaWX.cpp
View File

@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Name: ScintillaWX.cxx // Name: ScintillaWX.cxx
// Purpose: A wxWindows implementation of Scintilla. A class derived // Purpose: A wxWidgets implementation of Scintilla. A class derived
// from ScintillaBase that uses the "wx platform" defined in // from ScintillaBase that uses the "wx platform" defined in
// PlatformWX.cxx This class is one end of a bridge between // PlatformWX.cxx This class is one end of a bridge between
// the wx world and the Scintilla world. It needs a peer // the wx world and the Scintilla world. It needs a peer

2
contrib/src/stc/ScintillaWX.h
View File

@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Name: ScintillaWX.h // Name: ScintillaWX.h
// Purpose: A wxWindows implementation of Scintilla. A class derived // Purpose: A wxWidgets implementation of Scintilla. A class derived
// from ScintillaBase that uses the "wx platform" defined in // from ScintillaBase that uses the "wx platform" defined in
// PlatWX.cpp. This class is one end of a bridge between // PlatWX.cpp. This class is one end of a bridge between
// the wx world and the Scintilla world. It needs a peer // the wx world and the Scintilla world. It needs a peer

4
contrib/src/stc/scintilla/include/Platform.h
View File

@@ -1,7 +1,7 @@
// Scintilla source code edit control // Scintilla source code edit control
/** @file Platform.h /** @file Platform.h
** Interface to platform facilities. Also includes some basic utilities. ** Interface to platform facilities. Also includes some basic utilities.
** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows. ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWidgets.
**/ **/
// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed. // The License.txt file describes the conditions under which this software may be distributed.
@@ -12,7 +12,7 @@
// PLAT_GTK = GTK+ on Linux or Win32 // PLAT_GTK = GTK+ on Linux or Win32
// PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32 // PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
// PLAT_WIN = Win32 API on Win32 OS // PLAT_WIN = Win32 API on Win32 OS
// PLAT_WX is wxWindows on any supported platform // PLAT_WX is wxWidgets on any supported platform
#define PLAT_GTK 0 #define PLAT_GTK 0
#define PLAT_GTK_WIN32 0 #define PLAT_GTK_WIN32 0

2
contrib/src/stc/stc.cpp
View File

@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Name: stc.cpp // Name: stc.cpp
// Purpose: A wxWindows implementation of Scintilla. This class is the // Purpose: A wxWidgets implementation of Scintilla. This class is the
// one meant to be used directly by wx applications. It does not // one meant to be used directly by wx applications. It does not
// derive directly from the Scintilla classes, but instead // derive directly from the Scintilla classes, but instead
// delegates most things to the real Scintilla class. // delegates most things to the real Scintilla class.

2
contrib/src/stc/stc.cpp.in
View File

@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Name: stc.cpp // Name: stc.cpp
// Purpose: A wxWindows implementation of Scintilla. This class is the // Purpose: A wxWidgets implementation of Scintilla. This class is the
// one meant to be used directly by wx applications. It does not // one meant to be used directly by wx applications. It does not
// derive directly from the Scintilla classes, but instead // derive directly from the Scintilla classes, but instead
// delegates most things to the real Scintilla class. // delegates most things to the real Scintilla class.

2
contrib/utils/convertrc/convert.cpp
View File

@@ -18,7 +18,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif

2
contrib/utils/convertrc/rc2wxr.cpp
View File

@@ -46,7 +46,7 @@ This code was used as a starting point for my rc2xml converter
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP

4
contrib/utils/convertrc/rc2xml.cpp
View File

@@ -28,7 +28,7 @@ cross platform (wxGTK,etc)
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
@@ -730,7 +730,7 @@ void rc2xml::WriteName(wxString name)
//Try to convert any number ids into names //Try to convert any number ids into names
name=LookUpId(name); name=LookUpId(name);
//Replace common MS ids with wxWindows ids //Replace common MS ids with wxWidgets ids
//I didn't do everyone of them //I didn't do everyone of them
if (name==_T("IDOK")) if (name==_T("IDOK"))
name=_T("wxID_OK"); name=_T("wxID_OK");

4
contrib/utils/wxrcedit/edapp.cpp
View File

@@ -20,7 +20,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers // need because it includes almost all "standard" wxWidgets headers
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -47,7 +47,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
SetVendorName(wxT("wxWindows")); SetVendorName(wxT("wxWidgets"));
SetAppName(wxT("wxrcedit")); SetAppName(wxT("wxrcedit"));
wxString arg = (argc >= 1) ? argv[1] : _T(""); wxString arg = (argc >= 1) ? argv[1] : _T("");
wxInitAllImageHandlers(); wxInitAllImageHandlers();

2
contrib/utils/wxrcedit/editor.cpp
View File

@@ -183,7 +183,7 @@ END_EVENT_TABLE()
EditorFrame *EditorFrame::ms_Instance = NULL; EditorFrame *EditorFrame::ms_Instance = NULL;
EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename) EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename)
: wxFrame(parent, -1, filename + _("- wxWindows resources editor")) : wxFrame(parent, -1, filename + _("- wxWidgets resources editor"))
{ {
ms_Instance = this; ms_Instance = this;

2
contrib/utils/wxrcedit/splittree.cpp
View File

@@ -30,7 +30,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif

2
demos/dbbrowse/dummy.cpp
View File

@@ -11,7 +11,7 @@
* always start by compiling this and producing the PCH file. * always start by compiling this and producing the PCH file.
* Then subsequent source files use the PCH file. * Then subsequent source files use the PCH file.
* *
* If precompiling wx.h for wxWindows and derived apps, * If precompiling wx.h for wxWidgets and derived apps,
* link dummy.obj with your program (the MSC 7 linker complains otherwise). * link dummy.obj with your program (the MSC 7 linker complains otherwise).
* *
* This is the only convenient way I found to use precompiled headers * This is the only convenient way I found to use precompiled headers

2
demos/dbbrowse/std.h
View File

@@ -3,7 +3,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
//-- all #includes that the whole Project needs. ---------------------------- //-- all #includes that the whole Project needs. ----------------------------
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <wx/config.h> // to let wxWindows choose a wxConfig class for your platform #include <wx/config.h> // to let wxWidgets choose a wxConfig class for your platform
#include <wx/confbase.h> // base config class #include <wx/confbase.h> // base config class
#include <wx/dbtable.h> #include <wx/dbtable.h>
#include <wx/generic/grid.h> #include <wx/generic/grid.h>

2
demos/forty/canvas.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__

2
demos/forty/canvas.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _CANVAS_H_ #ifndef _CANVAS_H_
#define _CANVAS_H_ #define _CANVAS_H_

2
demos/forty/card.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//+-------------------------------------------------------------+ //+-------------------------------------------------------------+
//| Description //| Description

2
demos/forty/card.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//+-------------------------------------------------------------+ //+-------------------------------------------------------------+
//| Description: | //| Description: |

2
demos/forty/forty.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__

2
demos/forty/forty.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _FORTY_H_ #ifndef _FORTY_H_
#define _FORTY_H_ #define _FORTY_H_

2
demos/forty/game.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__

2
demos/forty/game.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _GAME_H_ #ifndef _GAME_H_
#define _GAME_H_ #define _GAME_H_

2
demos/forty/pile.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//+-------------------------------------------------------------+ //+-------------------------------------------------------------+
//| Description: | //| Description: |

2
demos/forty/pile.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
//+-------------------------------------------------------------+ //+-------------------------------------------------------------+
//| Description: | //| Description: |

2
demos/forty/playerdg.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__

2
demos/forty/playerdg.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _PLAYERDG_H_ #ifndef _PLAYERDG_H_
#define _PLAYERDG_H_ #define _PLAYERDG_H_

2
demos/forty/scoredg.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(__APPLE__) #if defined(__GNUG__) && !defined(__APPLE__)

2
demos/forty/scoredg.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _SCOREDG_H_ #ifndef _SCOREDG_H_
#define _SCOREDG_H_ #define _SCOREDG_H_

4
demos/forty/scorefil.cpp
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 14th May 1998 - ported to wxWindows 2.0 // Last modified: 14th May 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -68,7 +68,7 @@ ScoreFile::ScoreFile(const wxString& appName)
} }
#endif #endif
m_config = new wxConfig(appName, _T("wxWindows"), appName, _T(""), m_config = new wxConfig(appName, _T("wxWidgets"), appName, _T(""),
wxCONFIG_USE_LOCAL_FILE); // only local wxCONFIG_USE_LOCAL_FILE); // only local
} }

2
demos/forty/scorefil.h
View File

@@ -8,7 +8,7 @@
// Copyright: (c) 1993-1998 Chris Breeze // Copyright: (c) 1993-1998 Chris Breeze
// Licence: wxWindows licence // Licence: wxWindows licence
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Last modified: 22nd July 1998 - ported to wxWindows 2.0 // Last modified: 22nd July 1998 - ported to wxWidgets 2.0
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _SCOREFILE_H_ #ifndef _SCOREFILE_H_
#define _SCOREFILE_H_ #define _SCOREFILE_H_

4
demos/fractal/fractal.cpp
View File

@@ -23,7 +23,7 @@ done for MS-Windows. On a Sun the colours look a little washed
out and there is not as much snow or high mountains (maybe the out and there is not as much snow or high mountains (maybe the
random number generators fault). The viewing plane is not random number generators fault). The viewing plane is not
quite right as the original code used SetViewportOrg() which there quite right as the original code used SetViewportOrg() which there
doesn't seem to be an equivalent of under wxWindows, and my quick doesn't seem to be an equivalent of under wxWidgets, and my quick
hack doesn't fix. hack doesn't fix.
*/ */
@@ -94,7 +94,7 @@ DECLARE_EVENT_TABLE()
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWindows"), wxPoint(-1, -1), wxSize(640, 480)); MyFrame *frame = new MyFrame(NULL, _T("Fractal Mountains for wxWidgets"), wxPoint(-1, -1), wxSize(640, 480));
// Make a menubar // Make a menubar
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;

4
demos/life/dialogs.cpp
View File

@@ -60,7 +60,7 @@ enum
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Event tables // Event tables
@@ -181,7 +181,7 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
sizer->Add( sbmp, 0, wxCENTRE | wxALL, 10 ); sizer->Add( sbmp, 0, wxCENTRE | wxALL, 10 );
sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 ); sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWindows\n\n\ sizer->Add( CreateTextSizer(_("Life! version 2.2 for wxWidgets\n\n\
(c) 2000 Guillermo Rodriguez Garcia\n\n\ (c) 2000 Guillermo Rodriguez Garcia\n\n\
<guille@iies.es>\n\n\ <guille@iies.es>\n\n\
Portions of the code are based in XLife;\n\ Portions of the code are based in XLife;\n\

2
demos/life/dialogs.h
View File

@@ -50,7 +50,7 @@ public:
void OnListBox(wxCommandEvent &event); void OnListBox(wxCommandEvent &event);
private: private:
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
int m_value; int m_value;

4
demos/life/life.cpp
View File

@@ -67,7 +67,7 @@
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// IDs for the controls and the menu commands. Exluding those already defined // IDs for the controls and the menu commands. Exluding those already defined
// by wxWindows, such as wxID_NEW. // by wxWidgets, such as wxID_NEW.
enum enum
{ {
// timer // timer
@@ -99,7 +99,7 @@ enum
}; };
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Event tables // Event tables

6
demos/life/life.h
View File

@@ -57,7 +57,7 @@ public:
void DrawCell(wxInt32 i, wxInt32 j, bool alive); void DrawCell(wxInt32 i, wxInt32 j, bool alive);
private: private:
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
// draw a cell (parametrized by DC) // draw a cell (parametrized by DC)
@@ -109,7 +109,7 @@ public:
LifeNavigator(wxWindow *parent); LifeNavigator(wxWindow *parent);
private: private:
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
// event handlers // event handlers
@@ -133,7 +133,7 @@ public:
void UpdateUI(); void UpdateUI();
private: private:
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
// event handlers // event handlers

1
distrib/msw/makefile.rsp
View File

@@ -38,6 +38,7 @@ samples/html/test/Makefile.in
samples/html/virtual/Makefile.in samples/html/virtual/Makefile.in
samples/html/widget/Makefile.in samples/html/widget/Makefile.in
samples/html/zip/Makefile.in samples/html/zip/Makefile.in
samples/html/htmlctrl/Makefile.in
samples/image/Makefile.in samples/image/Makefile.in
samples/joytest/Makefile.in samples/joytest/Makefile.in
samples/layout/Makefile.in samples/layout/Makefile.in

2
distrib/msw/vc.rsp
View File

@@ -119,6 +119,8 @@ samples/html/widget/widget.dsp
samples/html/widget/widget.dsw samples/html/widget/widget.dsw
samples/html/zip/zip.dsp samples/html/zip/zip.dsp
samples/html/zip/zip.dsw samples/html/zip/zip.dsw
samples/html/htmlctrl/htmlctrl.dsw
samples/html/htmlctrl/htmlctrl.dsp
samples/image/image.dsp samples/image/image.dsp
samples/image/image.dsw samples/image/image.dsw

2
include/wx/stc/stc.h
View File

@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Name: stc.h // Name: stc.h
// Purpose: A wxWindows implementation of Scintilla. This class is the // Purpose: A wxWidgets implementation of Scintilla. This class is the
// one meant to be used directly by wx applications. It does not // one meant to be used directly by wx applications. It does not
// derive directly from the Scintilla classes, and in fact there // derive directly from the Scintilla classes, and in fact there
// is no mention of Scintilla classes at all in this header. // is no mention of Scintilla classes at all in this header.

10
include/wx/xrc/xmlres.h
View File

@@ -59,7 +59,7 @@ class wxXmlResourceModule;
// older versions of the library may ignore it. // older versions of the library may ignore it.
// - if you change version number, follow these steps: // - if you change version number, follow these steps:
// - set major, minor and release numbers to respective version numbers of // - set major, minor and release numbers to respective version numbers of
// the wxWindows library (see wx/version.h) // the wxWidgets library (see wx/version.h)
// - reset revision to 0 unless the first three are same as before, // - reset revision to 0 unless the first three are same as before,
// in which case you should increase revision by one // in which case you should increase revision by one
#define WX_XMLRES_CURRENT_VERSION_MAJOR 2 #define WX_XMLRES_CURRENT_VERSION_MAJOR 2
@@ -127,7 +127,7 @@ public:
// Initialize handlers for all supported controls/windows. This will // Initialize handlers for all supported controls/windows. This will
// make the executable quite big because it forces linking against // make the executable quite big because it forces linking against
// most of the wxWindows library. // most of the wxWidgets library.
void InitAllHandlers(); void InitAllHandlers();
// Initialize only a specific handler (or custom handler). Convention says // Initialize only a specific handler (or custom handler). Convention says
@@ -274,7 +274,7 @@ private:
// This macro translates string identifier (as used in XML resource, // This macro translates string identifier (as used in XML resource,
// e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by // e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
// wxWindows event tables. // wxWidgets event tables.
// Example: // Example:
// BEGIN_EVENT_TABLE(MyFrame, wxFrame) // BEGIN_EVENT_TABLE(MyFrame, wxFrame)
// EVT_MENU(XRCID("quit"), MyFrame::OnQuit) // EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
@@ -463,9 +463,9 @@ WXDLLIMPEXP_XRC void wxXmlInitResourceModule();
// This class is used to create instances of XRC "object" nodes with "subclass" // This class is used to create instances of XRC "object" nodes with "subclass"
// property. It is _not_ supposed to be used by XRC users, you should instead // property. It is _not_ supposed to be used by XRC users, you should instead
// register your subclasses via wxWindows' RTTI mechanism. This class is useful // register your subclasses via wxWidgets' RTTI mechanism. This class is useful
// only for language bindings developer who need a way to implement subclassing // only for language bindings developer who need a way to implement subclassing
// in wxWindows ports that don't support wxRTTI (e.g. wxPython). // in wxWidgets ports that don't support wxRTTI (e.g. wxPython).
class WXDLLIMPEXP_XRC wxXmlSubclassFactory class WXDLLIMPEXP_XRC wxXmlSubclassFactory
{ {
public: public:

20
samples/access/accesstest.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: accesstest.cpp // Name: accesstest.cpp
// Purpose: wxWindows accessibility sample // Purpose: wxWidgets accessibility sample
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 2002-02-12 // Created: 2002-02-12
@@ -25,7 +25,7 @@
#endif #endif
// for all others, include the necessary headers (this file is usually all you // for all others, include the necessary headers (this file is usually all you
// need because it includes almost all "standard" wxWindows headers) // need because it includes almost all "standard" wxWidgets headers)
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@@ -107,7 +107,7 @@ public:
private: private:
wxTextCtrl* m_textCtrl; wxTextCtrl* m_textCtrl;
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -131,10 +131,10 @@ enum
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the event tables connect the wxWindows events with the functions (event // the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the // handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler. // simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -145,7 +145,7 @@ END_EVENT_TABLE()
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY
// Create a new application object: this macro will allow wxWindows to create // Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a // the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function // static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -172,7 +172,7 @@ bool MyApp::OnInit()
wxHelpProvider::Set(new wxSimpleHelpProvider()); wxHelpProvider::Set(new wxSimpleHelpProvider());
// create the main application window // create the main application window
MyFrame *frame = new MyFrame(_T("AccessTest wxWindows App"), MyFrame *frame = new MyFrame(_T("AccessTest wxWidgets App"),
wxPoint(50, 50), wxSize(450, 340)); wxPoint(50, 50), wxSize(450, 340));
// and show it (the frames, unlike simple controls, are not shown when // and show it (the frames, unlike simple controls, are not shown when
@@ -352,7 +352,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
#if 0 // wxUSE_STATUSBAR #if 0 // 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);
SetStatusText(_T("Welcome to wxWindows!")); SetStatusText(_T("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
@@ -365,12 +365,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
listBox->Append(wxT("Sealing wax")); listBox->Append(wxT("Sealing wax"));
listBox->Append(wxT("Strings")); listBox->Append(wxT("Strings"));
listBox->CreateAccessible(); listBox->CreateAccessible();
listBox->SetHelpText(wxT("This is a sample wxWindows listbox, with a number of items in it.")); listBox->SetHelpText(wxT("This is a sample wxWidgets listbox, with a number of items in it."));
m_textCtrl = new wxTextCtrl(splitter, -1, wxT(""), wxDefaultPosition, m_textCtrl = new wxTextCtrl(splitter, -1, wxT(""), wxDefaultPosition,
wxDefaultSize, wxTE_MULTILINE); wxDefaultSize, wxTE_MULTILINE);
m_textCtrl->CreateAccessible(); m_textCtrl->CreateAccessible();
m_textCtrl->SetHelpText(wxT("This is a sample wxWindows multiline text control.")); m_textCtrl->SetHelpText(wxT("This is a sample wxWidgets multiline text control."));
splitter->SplitHorizontally(listBox, m_textCtrl, 150); splitter->SplitHorizontally(listBox, m_textCtrl, 150);

2
samples/artprov/arttest.cpp
View File

@@ -68,7 +68,7 @@ enum
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)

12
samples/calendar/calendar.cpp
View File

@@ -118,7 +118,7 @@ public:
private: private:
MyPanel *m_panel; MyPanel *m_panel;
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -145,10 +145,10 @@ enum
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event tables and other macros for wxWindows // event tables and other macros for wxWidgets
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the event tables connect the wxWindows events with the functions (event // the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the // handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler. // simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -180,7 +180,7 @@ BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick) EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick)
END_EVENT_TABLE() END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create // Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a // the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function // static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -199,7 +199,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
// Create the main application window // Create the main application window
MyFrame *frame = new MyFrame(_T("Calendar wxWindows sample"), MyFrame *frame = new MyFrame(_T("Calendar wxWidgets sample"),
wxPoint(50, 50), wxSize(450, 340)); wxPoint(50, 50), wxSize(450, 340));
frame->Show(true); frame->Show(true);
@@ -273,7 +273,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
#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);
SetStatusText(_T("Welcome to wxWindows!")); SetStatusText(_T("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }

Some files were not shown because too many files have changed in this diff Show More