Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 14:20:35 +08:00
Code Issues Actions 9 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
contrib/include/wx/deprecated/tbarsmpl.h
+1 -1
View File
@@ -25,7 +25,7 @@
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
contrib/include/wx/mmedia/vidbase.h
+1 -1
View File
@@ -27,7 +27,7 @@
#endif
// 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
#include "wx/defs.h"
#include "wx/stream.h"
contrib/include/wx/mmedia/vidwin.h
+1 -1
View File
@@ -30,7 +30,7 @@
#endif
// 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
#include "wx/string.h"
#include "wx/stream.h"
contrib/include/wx/mmedia/vidxanm.h
+1 -1
View File
@@ -26,7 +26,7 @@
#endif
// 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
#include "wx/defs.h"
#include "wx/string.h"
contrib/include/wx/net/email.h
+1 -1
View File
@@ -32,7 +32,7 @@ public:
//// Operations
// 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,
const wxString& sendMail = wxT("/usr/lib/sendmail -t"));
contrib/include/wx/stc/stc.h
+1 -1
View File
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////
// 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
// derive directly from the Scintilla classes, and in fact there
// is no mention of Scintilla classes at all in this header.
contrib/include/wx/xrc/xmlres.h
+5 -5
View File
@@ -59,7 +59,7 @@ class wxXmlResourceModule;
// older versions of the library may ignore it.
// - if you change version number, follow these steps:
// - 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,
// in which case you should increase revision by one
#define WX_XMLRES_CURRENT_VERSION_MAJOR 2
@@ -127,7 +127,7 @@ public:
// Initialize handlers for all supported controls/windows. This will
// make the executable quite big because it forces linking against
// most of the wxWindows library.
// most of the wxWidgets library.
void InitAllHandlers();
// 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,
// e.g. <menuitem id="my_menu">...</menuitem>) to integer id that is needed by
// wxWindows event tables.
// wxWidgets event tables.
// Example:
// BEGIN_EVENT_TABLE(MyFrame, wxFrame)
// 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"
// 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
// 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
{
public:
contrib/samples/animate/anitest.cpp
+1 -1
View File
@@ -139,7 +139,7 @@ void MyFrame::OnQuit(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("About Animation Demo"));
}
contrib/samples/deprecated/resource/resource.cpp
+5 -5
View File
@@ -41,7 +41,7 @@
// If we wanted to demonstrate total platform independence,
// 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
// platforms.
@@ -104,7 +104,7 @@ bool MyApp::OnInit(void)
// Create the main frame window
frame = new MyFrame( (wxFrame *) NULL, -1,
wxT("wxWindows Resource Sample"),
wxT("wxWidgets Resource Sample"),
wxPoint(-1, -1), wxSize(300, 250) );
// Give it a status line
@@ -172,8 +172,8 @@ MyFrame::MyFrame
void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxMessageBox(wxT("wxWindows resource sample.\n")
wxT("(c) Julian Smart"), wxT("About wxWindows sample"),
wxMessageBox(wxT("wxWidgets resource sample.\n")
wxT("(c) Julian Smart"), wxT("About wxWidgets sample"),
wxICON_INFORMATION | wxOK);
}
@@ -191,7 +191,7 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName(wxT("multitext3"), dialog);
if (text)
{
text->SetValue(wxT("wxWindows resource demo"));
text->SetValue(wxT("wxWidgets resource demo"));
}
dialog->ShowModal();
contrib/samples/deprecated/treelay/treelay.cpp
+1 -1
View File
@@ -185,7 +185,7 @@ void MyFrame::OnTopBottom(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))
contrib/samples/fl/fl_demo1.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
}
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 ),
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,
contrib/samples/fl/fl_demo2.cpp
+4 -4
View File
@@ -24,7 +24,7 @@
#include "wx/wx.h"
#endif
// wxWindows headers.
// wxWidgets headers.
#include "wx/treectrl.h"
#include "wx/imaglist.h"
#include "wx/notebook.h"
@@ -55,7 +55,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void)
{
// 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
#ifdef __WINDOWS__
@@ -170,7 +170,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h
mpInternalFrm = (wxPanel*)this;
mAboutBox.Create( this, -1, _T("About box in wxWindows style..."),
mAboutBox.Create( this, -1, _T("About box in wxWidgets style..."),
wxDefaultPosition,
wxSize( 385,220),
wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL );
@@ -665,7 +665,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
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, _("serializer-classes (grabbed at run-time)"), 0 );
contrib/samples/fl/fl_sample1.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void)
{
// wxWindows boiler-plate:
// wxWidgets boiler-plate:
MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
contrib/samples/fl/fl_sample2.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void)
{
// wxWindows boiler-plate:
// wxWidgets boiler-plate:
MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
contrib/samples/fl/fl_sample3.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void)
{
// wxWindows boiler-plate:
// wxWidgets boiler-plate:
MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
contrib/samples/gizmos/dynsash/dynsash.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
contrib/samples/gizmos/editlbox/test.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
contrib/samples/gizmos/led/led.cpp
+5 -5
View File
@@ -25,7 +25,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
@@ -91,7 +91,7 @@ public:
private:
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()
};
@@ -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
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -141,7 +141,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(LED_About, MyFrame::OnAbout)
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
// 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
contrib/samples/gizmos/splittree/tree.cpp
+5 -5
View File
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: tree.cpp
// Purpose: Minimal wxWindows sample
// Purpose: Minimal wxWidgets sample
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
@@ -29,7 +29,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
@@ -103,10 +103,10 @@ static char * icon2_xpm[] = {
#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
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -114,7 +114,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
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
// 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
contrib/samples/gizmos/splittree/tree.h
+1 -1
View File
@@ -49,7 +49,7 @@ protected:
TestValueWindow* m_valueWindow;
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()
};
contrib/samples/mmedia/mmbman.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
contrib/samples/mmedia/mmboard.cpp
+6 -6
View File
@@ -28,7 +28,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
@@ -91,7 +91,7 @@ public:
void CloseVideoWindow();
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()
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)
@@ -274,7 +274,7 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
#if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(3);
SetStatusText(wxT("Welcome to wxWindows!"));
SetStatusText(wxT("Welcome to wxWidgets!"));
#endif // wxUSE_STATUSBAR
// Misc variables
@@ -398,8 +398,8 @@ void MMBoardFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MMBoardFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
wxString msg;
msg.Printf( wxT("wxWindows Multimedia board v1.0a, wxMMedia v2.0a:\n")
wxT("an example of the capabilities of the wxWindows multimedia classes.\n")
msg.Printf( wxT("wxWidgets Multimedia board v1.0a, wxMMedia v2.0a:\n")
wxT("an example of the capabilities of the wxWidgets multimedia classes.\n")
wxT("Copyright 1999, 2000, Guilhem Lavaux.\n"));
wxMessageBox(msg, _T("About MMBoard"), wxOK | wxICON_INFORMATION, this);
contrib/samples/ogl/studio/mainfrm.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
// window doesn't cause the proper refresh. Just refreshing the
// client doesn't work (presumably because it's clipping the
// 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
// child windows.
#if 0
contrib/samples/ogl/studio/studio.cpp
+3 -3
View File
@@ -161,7 +161,7 @@ bool csApp::OnInit(void)
frame->SetMenuBar(menuBar);
// Load the file history
wxConfig config(_T("OGL Studio"), _T("wxWindows"));
wxConfig config(_T("OGL Studio"), _T("wxWidgets"));
m_docManager->FileHistoryLoad(config);
frame->CreateStatusBar();
@@ -491,7 +491,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
// Read/write configuration information
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("mainY"), & m_mainFramePos.y);
@@ -505,7 +505,7 @@ bool csApp::ReadOptions()
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("mainY"), (long) m_mainFramePos.y);
contrib/samples/stc/defsext.h
+1 -1
View File
@@ -15,7 +15,7 @@
// headers
//----------------------------------------------------------------------------
//! wxWindows headers
//! wxWidgets headers
#include <wx/print.h> // printing support
#include <wx/printdlg.h> // printing dialog
contrib/samples/stc/edit.cpp
+2 -2
View File
@@ -25,12 +25,12 @@
#endif
// 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
#include <wx/wx.h>
#endif
//! wxWindows headers
//! wxWidgets headers
#include <wx/file.h> // raw file io support
#include <wx/filename.h> // filename support
contrib/samples/stc/edit.h
+2 -2
View File
@@ -20,9 +20,9 @@
// headers
//----------------------------------------------------------------------------
//! wxWindows headers
//! wxWidgets headers
//! wxWindows/contrib headers
//! wxWidgets/contrib headers
#include <wx/stc/stc.h> // styled text control
//! application headers
contrib/samples/stc/prefs.cpp
+3 -3
View File
@@ -20,14 +20,14 @@
#endif
// 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
#include <wx/wx.h>
#endif
//! wxWindows headers
//! wxWidgets headers
//! wxWindows/contrib headers
//! wxWidgets/contrib headers
//! application headers
#include "defsext.h" // Additional definitions
contrib/samples/stc/prefs.h
+2 -2
View File
@@ -20,9 +20,9 @@
// headers
//----------------------------------------------------------------------------
//! wxWindows headers
//! wxWidgets headers
//! wxWindows/contrib headers
//! wxWidgets/contrib headers
#include <wx/stc/stc.h> // styled text control
//! application headers
contrib/samples/stc/stctest.cpp
+6 -6
View File
@@ -20,12 +20,12 @@
#endif
// 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
#include <wx/wx.h>
#endif
//! wxWindows headers
//! wxWidgets headers
#include <wx/config.h> // configuration support
#include <wx/filedlg.h> // file dialog support
#include <wx/filename.h> // filename support
@@ -57,14 +57,14 @@
#define APP_DESCR _("See http://wxguide.sourceforge.net/")
#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_LICENCE _T("wxWindows")
#define APP_LICENCE _T("wxWidgets")
#define APP_VERSION _T("0.1.alpha")
#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 NONAME _("<untitled>")
@@ -99,7 +99,7 @@ private:
};
// created dynamically by wxWindows
// created dynamically by wxWidgets
DECLARE_APP (App);
//----------------------------------------------------------------------------
contrib/samples/svg/svgtest.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ void MyFrame::OnQuit(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("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
}
contrib/samples/xrc/custclas.cpp
+3 -3
View File
@@ -16,7 +16,7 @@
#endif
//-----------------------------------------------------------------------------
// Standard wxWindows headers
// Standard wxWidgets headers
//-----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
@@ -62,7 +62,7 @@ enum {
};
//-----------------------------------------------------------------------------
// wxWindows macro: implement dynamic class
// wxWidgets macro: implement dynamic class
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl )
contrib/samples/xrc/custclas.h
+7 -7
View File
@@ -35,8 +35,8 @@
//! A custom listctrl that resizes itself and pops up a context-sensitive menu.
class MyResizableListCtrl : public wxListCtrl
{
// Very helpful wxWindows macro required for wxWindows-RTTI tracing: By using this
// you will see "Leaked one object of type myResizeableListCtrl" in the debug log,
// 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,
// 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
// default value for all parameters in your constructor, or else having a dummy
@@ -47,14 +47,14 @@ public:
// 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 id The id of the progress_listbox. Will usually be -1 unless multiple
of them on the same dialog.
\param pos The pixel position of the listctrl on its parent window
\param size The pixel size of the listctrl
\param style Style of the listbox. See wxWindows wxListBox docs for details.
\param validator Window validator. See wxWindows docs for details.
\param style Style of the listbox. See wxWidgets wxListBox docs for details.
\param validator Window validator. See wxWidgets docs for details.
\param name Windows name (rarely used).
\param exclusion_column_caption The label of header of listctrl's exclusion
column.
@@ -76,7 +76,7 @@ protected:
// A custom function for a context sensitive menu.
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 );
// A custom function. What is called in the constructor, and in an OnSize()
@@ -84,7 +84,7 @@ protected:
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()
};
contrib/samples/xrc/derivdlg.cpp
+2 -2
View File
@@ -16,7 +16,7 @@
#endif
//-----------------------------------------------------------------------------
// Standard wxWindows headers
// Standard wxWidgets headers
//-----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
contrib/samples/xrc/derivdlg.h
+1 -1
View File
@@ -59,7 +59,7 @@ private:
// Override base class functions of a wxDialog.
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()
};
contrib/samples/xrc/myframe.cpp
+4 -4
View File
@@ -16,7 +16,7 @@
#endif
//-----------------------------------------------------------------------------
// Standard wxWindows headers
// Standard wxWidgets headers
//-----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
@@ -27,7 +27,7 @@
#endif
// 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
#include "wx/wx.h"
#endif
@@ -73,14 +73,14 @@
// 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
// 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
// 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
// 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)
EVT_MENU(XRCID("exit_tool_or_menuitem"), MyFrame::OnExitToolOrMenuCommand)
EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand)
contrib/samples/xrc/myframe.h
+1 -1
View File
@@ -55,7 +55,7 @@ private:
void OnArtProviderToolOrMenuCommand(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()
};
contrib/samples/xrc/rc/artprov.xrc
+1 -1
View File
@@ -1,6 +1,6 @@
<?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">
<title>wxArtProvider Example</title>
contrib/samples/xrc/rc/basicdlg.xrc
+1 -1
View File
@@ -1,6 +1,6 @@
<?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">
<title>Non-Derived Dialog Example</title>
contrib/samples/xrc/rc/controls.xrc
+1 -1
View File
@@ -1,6 +1,6 @@
<?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">
<title>Controls Example</title>
contrib/samples/xrc/rc/custclas.xrc
+2 -2
View File
File diff suppressed because one or more lines are too long
contrib/samples/xrc/rc/derivdlg.xrc
+1 -1
View File
@@ -1,6 +1,6 @@
<?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">
<title>Derived Dialog Example</title>
contrib/samples/xrc/rc/frame.xrc
+2 -2
View File
@@ -1,6 +1,6 @@
<?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">
<title>XML Resources Demo</title>
@@ -18,7 +18,7 @@
<object class="wxTextCtrl" name="message_textctrl">
<size>500,280</size>
<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>
contrib/samples/xrc/rc/menu.xrc
+2 -2
View File
@@ -1,6 +1,6 @@
<?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">
<style>wxMB_DOCKABLE</style>
@@ -28,7 +28,7 @@
<object class="wxMenuItem" name="controls_tool_or_menuitem">
<label>_Controls Example</label>
<bitmap>controls.xpm</bitmap>
<help>A notebook displaying all the wxWindows controls</help>
<help>A notebook displaying all the wxWidgets controls</help>
</object>
<object class="wxMenuItem" name="uncentered_tool_or_menuitem">
<label>_Uncentered Example</label>
contrib/samples/xrc/rc/platform.xrc
+1 -1
View File
@@ -1,6 +1,6 @@
<?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">
<title>Platform Property Example</title>
contrib/samples/xrc/rc/resource.xrc
+1 -1
View File
@@ -1,5 +1,5 @@
<?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">
<style>wxMB_DOCKABLE</style>
<object class="wxMenu" name="menu_file">
contrib/samples/xrc/rc/toolbar.xrc
+2 -2
View File
@@ -1,6 +1,6 @@
<?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">
<style>wxTB_FLAT|wxTB_DOCKABLE</style>
@@ -18,7 +18,7 @@
<object class="tool" name="controls_tool_or_menuitem">
<tooltip>Controls Example</tooltip>
<bitmap>controls.xpm</bitmap>
<longhelp>A notebook displaying all the wxWindows controls</longhelp>
<longhelp>A notebook displaying all the wxWidgets controls</longhelp>
</object>
<object class="tool" name="uncentered_tool_or_menuitem">
<tooltip>Uncentered Example</tooltip>
contrib/samples/xrc/rc/uncenter.xrc
+1 -1
View File
@@ -1,6 +1,6 @@
<?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">
<title>Uncentered Example</title>
contrib/samples/xrc/rc/variable.xrc
+1 -1
View File
@@ -1,6 +1,6 @@
<?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">
<title>Variable Expansion Example</title>

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