AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use wx-prefixed macros throughout the repository.

Browse Source 
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
Dimitri Schoolwerth 2015-04-23 15:49:01 +04:00
parent 2d3f617b34
commit 8f8d58d193
1697 changed files with 3543 additions and 3543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/bakefiles/wxpresets/sample/minimal.cpp
View File

@ -64,7 +64,7 @@ public:
private:
// any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@ -90,17 +90,17 @@ enum
// the event tables connect the wxWindows 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)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also implements the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
wxIMPLEMENT_APP(MyApp);
// ============================================================================
// implementation

10
demos/bombs/bombs.cpp
View File

@ -32,7 +32,7 @@
# include "bombs.xpm"
#endif
IMPLEMENT_APP(BombsApp)
wxIMPLEMENT_APP(BombsApp);
#ifdef __WXWINCE__
STDAPI_(__int64) CeGetRandomSeed();
@ -54,7 +54,7 @@ bool BombsApp::OnInit()
return true;
}
BEGIN_EVENT_TABLE(BombsFrame, wxFrame)
wxBEGIN_EVENT_TABLE(BombsFrame, wxFrame)
EVT_MENU(wxID_NEW, BombsFrame::OnNewGame)
EVT_MENU(bombsID_EASY, BombsFrame::OnEasyGame)
EVT_MENU(bombsID_MEDIUM, BombsFrame::OnMediumGame)
@ -62,7 +62,7 @@ BEGIN_EVENT_TABLE(BombsFrame, wxFrame)
EVT_MENU(bombsID_EASYCORNER, BombsFrame::OnEasyCorner)
EVT_MENU(wxID_EXIT, BombsFrame::OnExit)
EVT_MENU(wxID_ABOUT, BombsFrame::OnAbout)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BombsFrame::BombsFrame(BombsGame *game)
: wxFrame(NULL, wxID_ANY, wxT("wxBombs"), wxDefaultPosition,
@ -216,11 +216,11 @@ void BombsFrame::OnEasyCorner(wxCommandEvent& WXUNUSED(event))
NewGame(m_lastLevel, true);
}
BEGIN_EVENT_TABLE(BombsCanvas, wxPanel)
wxBEGIN_EVENT_TABLE(BombsCanvas, wxPanel)
EVT_PAINT(BombsCanvas::OnPaint)
EVT_MOUSE_EVENTS(BombsCanvas::OnMouseEvent)
EVT_CHAR(BombsCanvas::OnChar)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BombsCanvas::BombsCanvas(wxFrame *parent, BombsGame *game)
: wxPanel(parent, wxID_ANY)

6
demos/bombs/bombs.h
View File

@ -30,7 +30,7 @@ private :
};
DECLARE_APP(BombsApp)
wxDECLARE_APP(BombsApp);
class BombsCanvas;
@ -62,7 +62,7 @@ private:
// Subwindows for reference within the program.
BombsCanvas *m_canvas;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// App specific menu identifiers
@ -106,7 +106,7 @@ private:
int m_cellWidth;
int m_cellHeight;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
/* The following sizes should probably be redefined */

4
demos/forty/canvas.cpp
View File

@ -28,9 +28,9 @@
#include "playerdg.h"
#include "canvas.h"
BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
wxBEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
EVT_MOUSE_EVENTS(FortyCanvas::OnMouseEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
wxScrolledWindow(parent, wxID_ANY, pos, size, 0),

2
demos/forty/canvas.h
View File

@ -39,7 +39,7 @@ public:
void LayoutGame();
void ShowPlayerDialog();
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
private:
wxFont* m_font;

6
demos/forty/forty.cpp
View File

@ -34,7 +34,7 @@
#include "wx/stockitem.h"
BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(FortyFrame, wxFrame)
EVT_MENU(wxID_NEW, FortyFrame::NewGame)
EVT_MENU(wxID_EXIT, FortyFrame::Exit)
EVT_MENU(wxID_ABOUT, FortyFrame::About)
@ -46,10 +46,10 @@ BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
EVT_MENU(HELPING_HAND, FortyFrame::ToggleHelpingHand)
EVT_MENU(LARGE_CARDS, FortyFrame::ToggleCardSize)
EVT_CLOSE(FortyFrame::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Create a new application object
IMPLEMENT_APP (FortyApp)
wxIMPLEMENT_APP(FortyApp);
wxColour* FortyApp::m_backgroundColour = 0;
wxColour* FortyApp::m_textColour = 0;

4
demos/forty/forty.h
View File

@ -31,7 +31,7 @@ private:
wxString m_helpFile;
};
DECLARE_APP(FortyApp)
wxDECLARE_APP(FortyApp);
class FortyCanvas;
class FortyFrame: public wxFrame
@ -56,7 +56,7 @@ public:
FortyCanvas* GetCanvas() { return m_canvas; }
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
private:
enum MenuCommands {

4
demos/forty/playerdg.cpp
View File

@ -24,13 +24,13 @@
const int ID_LISTBOX = 101;
BEGIN_EVENT_TABLE(PlayerSelectionDialog, wxDialog)
wxBEGIN_EVENT_TABLE(PlayerSelectionDialog, wxDialog)
EVT_SIZE(PlayerSelectionDialog::OnSize)
EVT_BUTTON(wxID_OK, PlayerSelectionDialog::ButtonCallback)
EVT_BUTTON(wxID_CANCEL, PlayerSelectionDialog::ButtonCallback)
EVT_LISTBOX(ID_LISTBOX, PlayerSelectionDialog::SelectCallback)
EVT_CLOSE(PlayerSelectionDialog::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
PlayerSelectionDialog::PlayerSelectionDialog(
wxWindow* parent,

2
demos/forty/playerdg.h
View File

@ -23,7 +23,7 @@ public:
void SelectCallback(wxCommandEvent& event);
void OnSize(wxSizeEvent& event);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
protected:
friend void SelectCallback(wxListBox&, wxCommandEvent&);

4
demos/forty/scoredg.cpp
View File

@ -125,9 +125,9 @@ void ScoreCanvas::OnDraw(wxDC& dc)
}
#endif
BEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
wxBEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
EVT_CLOSE(ScoreDialog::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) :
wxDialog(parent, wxID_ANY, _("Scores"),

2
demos/forty/scoredg.h
View File

@ -27,7 +27,7 @@ private:
ScoreFile* m_scoreFile;
wxButton* m_OK;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif

14
demos/fractal/fractal.cpp
View File

@ -57,7 +57,7 @@ public:
bool OnInit();
};
IMPLEMENT_APP(MyApp)
wxIMPLEMENT_APP(MyApp);
// Define a new frame type
class MyFrame: public wxFrame
@ -68,7 +68,7 @@ public:
void OnCloseWindow(wxCloseEvent& event);
void OnExit(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// Define a new canvas which can receive some events
@ -85,7 +85,7 @@ private:
wxBrush WaterBrush;
int Sealevel;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// `Main program' equivalent, creating windows and returning main app frame
@ -112,10 +112,10 @@ bool MyApp::OnInit()
return true;
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_CLOSE(MyFrame::OnCloseWindow)
EVT_MENU(wxID_EXIT, MyFrame::OnExit)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// My frame constructor
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
@ -140,9 +140,9 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
destroyed = true;
}
BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
wxBEGIN_EVENT_TABLE(MyCanvas, wxWindow)
EVT_PAINT(MyCanvas::OnPaint)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxFrame *frame):

4
demos/life/dialogs.cpp
View File

@ -57,9 +57,9 @@ enum
// --------------------------------------------------------------------------
// Event tables
BEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
wxBEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
EVT_LISTBOX (ID_LISTBOX, LifeSamplesDialog::OnListBox)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ==========================================================================

2
demos/life/dialogs.h
View File

@ -34,7 +34,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
int m_value;
wxListBox *m_list;

4
demos/life/game.cpp
View File

@ -922,7 +922,7 @@ bool Life::NextTic()
class LifeModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(LifeModule)
wxDECLARE_DYNAMIC_CLASS(LifeModule);
public:
LifeModule() {};
@ -930,7 +930,7 @@ public:
void OnExit();
};
IMPLEMENT_DYNAMIC_CLASS(LifeModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(LifeModule, wxModule);
bool LifeModule::OnInit()
{

14
demos/life/life.cpp
View File

@ -97,7 +97,7 @@ enum
// --------------------------------------------------------------------------
// Event tables
BEGIN_EVENT_TABLE(LifeFrame, wxFrame)
wxBEGIN_EVENT_TABLE(LifeFrame, wxFrame)
EVT_MENU (wxID_NEW, LifeFrame::OnMenu)
#if wxUSE_FILEDLG
EVT_MENU (wxID_OPEN, LifeFrame::OnOpen)
@ -122,13 +122,13 @@ BEGIN_EVENT_TABLE(LifeFrame, wxFrame)
EVT_COMMAND_SCROLL (ID_SLIDER, LifeFrame::OnSlider)
EVT_TIMER (ID_TIMER, LifeFrame::OnTimer)
EVT_CLOSE ( LifeFrame::OnClose)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BEGIN_EVENT_TABLE(LifeNavigator, wxMiniFrame)
wxBEGIN_EVENT_TABLE(LifeNavigator, wxMiniFrame)
EVT_CLOSE ( LifeNavigator::OnClose)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BEGIN_EVENT_TABLE(LifeCanvas, wxWindow)
wxBEGIN_EVENT_TABLE(LifeCanvas, wxWindow)
EVT_PAINT ( LifeCanvas::OnPaint)
EVT_SCROLLWIN ( LifeCanvas::OnScroll)
EVT_SIZE ( LifeCanvas::OnSize)
@ -137,11 +137,11 @@ BEGIN_EVENT_TABLE(LifeCanvas, wxWindow)
EVT_LEFT_UP ( LifeCanvas::OnMouse)
EVT_LEFT_DCLICK ( LifeCanvas::OnMouse)
EVT_ERASE_BACKGROUND( LifeCanvas::OnEraseBackground)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Create a new application object
IMPLEMENT_APP(LifeApp)
wxIMPLEMENT_APP(LifeApp);
// ==========================================================================

6
demos/life/life.h
View File

@ -41,7 +41,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
// draw a cell (parametrized by DC)
void DrawCell(wxInt32 i, wxInt32 j, wxDC &dc);
@ -93,7 +93,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
// event handlers
void OnClose(wxCloseEvent& event);
@ -117,7 +117,7 @@ public:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
// event handlers
void OnMenu(wxCommandEvent& event);

10
demos/poem/wxpoem.cpp
View File

@ -96,7 +96,7 @@ void FindMax(int *max_thing, int thing);
STDAPI_(__int64) CeGetRandomSeed();
#endif
IMPLEMENT_APP(MyApp)
wxIMPLEMENT_APP(MyApp);
MainWindow *TheMainWindow = NULL;
@ -108,11 +108,11 @@ void MainWindow::CreateFonts()
m_italicFont = wxTheFontList->FindOrCreateFont(pointSize, wxSWISS, wxITALIC, wxNORMAL);
}
BEGIN_EVENT_TABLE(MainWindow, wxFrame)
wxBEGIN_EVENT_TABLE(MainWindow, wxFrame)
EVT_CLOSE(MainWindow::OnCloseWindow)
EVT_CHAR(MainWindow::OnChar)
EVT_MENU(wxID_ANY, MainWindow::OnPopup)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MainWindow::MainWindow(wxFrame *frame, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size, long style):
@ -581,11 +581,11 @@ void MainWindow::OnChar(wxKeyEvent& event)
canvas->OnChar(event);
}
BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
wxBEGIN_EVENT_TABLE(MyCanvas, wxWindow)
EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
EVT_CHAR(MyCanvas::OnChar)
EVT_PAINT(MyCanvas::OnPaint)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxFrame *frame):

6
demos/poem/wxpoem.h
View File

@ -25,7 +25,7 @@ public:
int OnExit();
};
DECLARE_APP(MyApp)
wxDECLARE_APP(MyApp);
// Define a new canvas which can receive some events
class MyCanvas: public wxWindow
@ -41,7 +41,7 @@ public:
private:
wxMenu *m_popupMenu;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// Define a new frame
@ -94,7 +94,7 @@ private:
// Icons
wxIcon *m_corners[4];
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// Menu items

8
distrib/autopackage/sample/minimal.cpp
View File

@ -64,7 +64,7 @@ public:
private:
// any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@ -90,17 +90,17 @@ enum
// the event tables connect the wxWindows 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)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also implements the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
wxIMPLEMENT_APP(MyApp);
// ============================================================================
// implementation

6
docs/doxygen/overviews/app.h
View File

@ -41,7 +41,7 @@ public:
virtual bool OnInit();
};
IMPLEMENT_APP(DerivedApp)
wxIMPLEMENT_APP(DerivedApp);
bool DerivedApp::OnInit()
{
@ -53,14 +53,14 @@ bool DerivedApp::OnInit()
}
@endcode
Note the use of IMPLEMENT_APP(appClass), which allows wxWidgets to dynamically
Note the use of wxIMPLEMENT_APP(appClass), which allows wxWidgets to dynamically
create an instance of the application object at the appropriate point in
wxWidgets initialization. Previous versions of wxWidgets used to rely on the
creation of a global application object, but this is no longer recommended,
because required global initialization may not have been performed at
application object construction time.
You can also use DECLARE_APP(appClass) in a header file to declare the wxGetApp
You can also use wxDECLARE_APP(appClass) in a header file to declare the wxGetApp
function which returns a reference to the application object. Otherwise you can
only use the global @c wxTheApp pointer which is of type @c wxApp*.

4
docs/doxygen/overviews/customwidgets.h
View File

@ -108,8 +108,8 @@ protected:
}
private:
DECLARE_DYNAMIC_CLASS(MySpecialWidget)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(MySpecialWidget);
wxDECLARE_EVENT_TABLE();
};
@endcode

6
docs/doxygen/overviews/debugging.h
View File

@ -38,9 +38,9 @@ be running on are unusually constrained (notice that when asserts are disabled
their condition is not even evaluated so the only run-time cost is a single
condition check and the extra space taken by the asserts in the code).
This automatic deactivation of debugging code is done by IMPLEMENT_APP() macro
so if you don't use you may need to explicitly call wxDISABLE_DEBUG_SUPPORT()
yourself.
This automatic deactivation of debugging code is done by wxIMPLEMENT_APP()
macro so if you don't use you may need to explicitly call
wxDISABLE_DEBUG_SUPPORT() yourself.
Also notice that it is possible to build your own application with a different
value of wxDEBUG_LEVEL than the one which was used for wxWidgets itself. E.g.

14
docs/doxygen/overviews/docview.h
View File

@ -114,9 +114,9 @@ wxDocument class, you need to derive a new class and override at least the
member functions SaveObject and LoadObject. SaveObject and LoadObject will be
called by the framework when the document needs to be saved or loaded.
Use the macros DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS in order to
allow the framework to create document objects on demand. When you create a
wxDocTemplate object on application initialization, you should pass
Use the macros wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS in order
to allow the framework to create document objects on demand. When you create
a wxDocTemplate object on application initialization, you should pass
CLASSINFO(YourDocumentClass) to the wxDocTemplate constructor so that it knows
how to create an instance of this class.
@ -139,8 +139,8 @@ To use the abstract wxView class, you need to derive a new class and override
at least the member functions OnCreate, OnDraw, OnUpdate and OnClose. You will
probably want to respond to menu commands from the frame containing the view.
Use the macros DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS in order to
allow the framework to create view objects on demand. When you create a
Use the macros wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS in order
to allow the framework to create view objects on demand. When you create a
wxDocTemplate object on application initialization, you should pass
CLASSINFO(YourViewClass) to the wxDocTemplate constructor so that it knows how
to create an instance of this class.
@ -295,10 +295,10 @@ In order to respond to a file load command from one of these identifiers, you
need to handle them using an event handler, for example:
@code
BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
wxBEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
{

4
docs/doxygen/overviews/roughguide.h
View File

@ -40,8 +40,8 @@ same code to draw to several different devices. You can draw using the member
functions of wxDC, such as wxDC::DrawLine and wxDC::DrawText. Control colour on
a window (wxColour) with brushes (wxBrush) and pens (wxPen).
To intercept events, you add a DECLARE_EVENT_TABLE macro to the window class
declaration, and put a BEGIN_EVENT_TABLE ... END_EVENT_TABLE block in the
To intercept events, you add a wxDECLARE_EVENT_TABLE macro to the window class
declaration, and put a wxBEGIN_EVENT_TABLE ... wxEND_EVENT_TABLE block in the
implementation file. Between these macros, you add event macros which map the
event (such as a mouse click) to a member function. These might override
predefined event handlers such as for wxKeyEvent and wxMouseEvent.

26
docs/doxygen/overviews/runtimeclass.h
View File

@ -30,8 +30,8 @@ all the others. This macro is limited to wxWidgets classes only and only works
with pointers (unlike the real dynamic_cast which also accepts references).
Each class that you wish to be known to the type system should have a macro
such as DECLARE_DYNAMIC_CLASS just inside the class declaration. The macro
IMPLEMENT_DYNAMIC_CLASS should be in the implementation file. Note that these
such as wxDECLARE_DYNAMIC_CLASS just inside the class declaration. The macro
wxIMPLEMENT_DYNAMIC_CLASS should be in the implementation file. Note that these
are entirely optional; use them if you wish to check object types, or create
instances of classes using the class name. However, it is good to get into the
habit of adding these macros for all classes.
@ -39,13 +39,13 @@ habit of adding these macros for all classes.
Variations on these macros are used for multiple inheritance, and abstract
classes that cannot be instantiated dynamically or otherwise.
DECLARE_DYNAMIC_CLASS inserts a static wxClassInfo declaration into the class,
initialized by IMPLEMENT_DYNAMIC_CLASS. When initialized, the wxClassInfo
object inserts itself into a linked list (accessed through wxClassInfo::first
and wxClassInfo::next pointers). The linked list is fully created by the time
all global initialisation is done.
wxDECLARE_DYNAMIC_CLASS inserts a static wxClassInfo declaration into the
class, initialized by wxIMPLEMENT_DYNAMIC_CLASS. When initialized, the
wxClassInfo object inserts itself into a linked list (accessed through
wxClassInfo::first and wxClassInfo::next pointers). The linked list is fully
created by the time all global initialisation is done.
IMPLEMENT_DYNAMIC_CLASS is a macro that not only initialises the static
wxIMPLEMENT_DYNAMIC_CLASS is a macro that not only initialises the static
wxClassInfo member, but defines a global function capable of creating a dynamic
object of the class in question. A pointer to this function is stored in
wxClassInfo, and is used when an object should be created dynamically.
@ -63,9 +63,9 @@ wxClassInfo object instead, then you can simply call wxClassInfo::CreateObject.
@section overview_rtti_classinfo wxClassInfo
This class stores meta-information about classes. An application may use macros
such as DECLARE_DYNAMIC_CLASS and IMPLEMENT_DYNAMIC_CLASS to record runtime
information about a class, including:
This class stores meta-information about classes. An application may use
macros such as wxDECLARE_DYNAMIC_CLASS and wxIMPLEMENT_DYNAMIC_CLASS to
record runtime information about a class, including:
@li Its position in the inheritance hierarchy.
@li The base class name(s) (up to two base classes are permitted).
@ -89,7 +89,7 @@ In a header file frame.h:
@code
class wxFrame : public wxWindow
{
DECLARE_DYNAMIC_CLASS(wxFrame)
wxDECLARE_DYNAMIC_CLASS(wxFrame);
private:
wxString m_title;
@ -102,7 +102,7 @@ public:
In a C++ file frame.cpp:
@code
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
wxIMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow);
wxFrame::wxFrame()
{

10
docs/doxygen/overviews/xrc.h
View File

@ -401,12 +401,12 @@ public:
{
Close();
}
DECLARE_EVENT_TABLE();
wxDECLARE_EVENT_TABLE();
};
BEGIN_EVENT_TABLE(TestWnd,TestWnd_Base)
wxBEGIN_EVENT_TABLE(TestWnd,TestWnd_Base)
EVT_BUTTON(XRCID("B"), TestWnd::OnBPressed)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
@endcode
It is also possible to access the wxSizerItem of a sizer that is part of a
@ -451,7 +451,7 @@ public:
virtual bool CanHandle(wxXmlNode *node);
// Register with wxWidgets' dynamic class subsystem.
DECLARE_DYNAMIC_CLASS(MyControlXmlHandler)
wxDECLARE_DYNAMIC_CLASS(MyControlXmlHandler);
};
@endcode
@ -459,7 +459,7 @@ The implementation of your custom XML handler will typically look as:
@code
// Register with wxWidgets' dynamic class subsystem.
IMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler)
wxIMPLEMENT_DYNAMIC_CLASS(MyControlXmlHandler, wxXmlResourceHandler);
MyControlXmlHandler::MyControlXmlHandler()
{

2
docs/doxygen/overviews/xrc_format.h
View File

@ -2554,7 +2554,7 @@ The subclass must satisfy a number of requirements:
-# It must be derived from the class specified in @c class attribute.
-# It must be visible in wxWidget's pseudo-RTTI mechanism, i.e. there must be
a DECLARE_DYNAMIC_CLASS() entry for it.
a wxDECLARE_DYNAMIC_CLASS() entry for it.
-# It must support two-phase creation. In particular, this means that it has
to have default constructor.
-# It cannot provide custom Create() method and must be constructible using

4
include/wx/animate.h
View File

@ -50,7 +50,7 @@ public:
wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
protected:
DECLARE_ABSTRACT_CLASS(wxAnimationBase)
wxDECLARE_ABSTRACT_CLASS(wxAnimationBase);
};
@ -106,7 +106,7 @@ protected:
virtual void DisplayStaticImage() = 0;
private:
DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase);
};

2
include/wx/app.h
View File

@ -862,7 +862,7 @@ public:
wxIMPLEMENT_WX_THEME_SUPPORT \
wxIMPLEMENT_APP_NO_THEMES(appname)
// Same as IMPLEMENT_APP(), but for console applications.
// Same as wxIMPLEMENT_APP(), but for console applications.
#define wxIMPLEMENT_APP_CONSOLE(appname) \
wxIMPLEMENT_WXWIN_MAIN_CONSOLE \
wxIMPLEMENT_APP_NO_MAIN(appname)

4
include/wx/archive.h
View File

@ -73,7 +73,7 @@ protected:
private:
wxArchiveNotifier *m_notifier;
DECLARE_ABSTRACT_CLASS(wxArchiveEntry)
wxDECLARE_ABSTRACT_CLASS(wxArchiveEntry);
};
@ -370,7 +370,7 @@ private:
static wxArchiveClassFactory *sm_first;
wxArchiveClassFactory *m_next;
DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory)
wxDECLARE_ABSTRACT_CLASS(wxArchiveClassFactory);
};
#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

2
include/wx/artprov.h
View File

@ -236,7 +236,7 @@ private:
// art resources cache (so that CreateXXX is not called that often):
static wxArtProviderCache *sm_cache;
DECLARE_ABSTRACT_CLASS(wxArtProvider)
wxDECLARE_ABSTRACT_CLASS(wxArtProvider);
};

6
include/wx/aui/auibar.h
View File

@ -105,7 +105,7 @@ private:
int m_toolId;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent);
};
@ -692,8 +692,8 @@ private:
// Common part of OnLeaveWindow() and OnCaptureLost().
void DoResetMouseState();
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxAuiToolBar)
wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxAuiToolBar);
};

10
include/wx/aui/auibook.h
View File

@ -85,7 +85,7 @@ private:
#ifndef SWIG
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent);
#endif
};
@ -235,8 +235,8 @@ protected:
wxAuiTabContainerButton* m_pressedButton;
#ifndef SWIG
DECLARE_CLASS(wxAuiTabCtrl)
DECLARE_EVENT_TABLE()
wxDECLARE_CLASS(wxAuiTabCtrl);
wxDECLARE_EVENT_TABLE();
#endif
};
@ -432,8 +432,8 @@ protected:
unsigned int m_flags;
#ifndef SWIG
DECLARE_CLASS(wxAuiNotebook)
DECLARE_EVENT_TABLE()
wxDECLARE_CLASS(wxAuiNotebook);
wxDECLARE_EVENT_TABLE();
#endif
};

4
include/wx/aui/floatpane.h
View File

@ -70,8 +70,8 @@ private:
wxAuiManager m_mgr;
#ifndef SWIG
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxAuiFloatingFrame)
wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxAuiFloatingFrame);
#endif // SWIG
};

6
include/wx/aui/framemanager.h
View File

@ -664,8 +664,8 @@ protected:
void* m_reserved;
#ifndef SWIG
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxAuiManager)
wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxAuiManager);
#endif // SWIG
};
@ -723,7 +723,7 @@ public:
#ifndef SWIG
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent);
#endif
};

12
include/wx/aui/tabmdi.h
View File

@ -107,8 +107,8 @@ protected:
virtual void DoGetClientSize(int *width, int *height) const;
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame);
};
//-----------------------------------------------------------------------------
@ -228,8 +228,8 @@ protected:
private:
DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame);
wxDECLARE_EVENT_TABLE();
friend class wxAuiMDIClientWindow;
};
@ -262,8 +262,8 @@ protected:
void OnSize(wxSizeEvent& evt);
private:
DECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow);
wxDECLARE_EVENT_TABLE();
};
#endif // wxUSE_AUI

4
include/wx/bitmap.h
View File

@ -146,7 +146,7 @@ private:
wxString m_extension;
wxBitmapType m_type;
DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
wxDECLARE_ABSTRACT_CLASS(wxBitmapHandler);
};
// ----------------------------------------------------------------------------
@ -254,7 +254,7 @@ public:
protected:
static wxList sm_handlers;
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
wxDECLARE_ABSTRACT_CLASS(wxBitmapBase);
};
#endif // wxUSE_BITMAP_BASE

6
include/wx/bookctrl.h
View File

@ -356,10 +356,10 @@ private:
// internal border
unsigned int m_internalBorder;
DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
wxDECLARE_ABSTRACT_CLASS(wxBookCtrlBase);
wxDECLARE_NO_COPY_CLASS(wxBookCtrlBase);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@ -398,7 +398,7 @@ private:
int m_nSel, // currently selected page
m_nOldSel; // previously selected page
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent);
};
typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);

2
include/wx/calctrl.h
View File

@ -172,7 +172,7 @@ public:
private:
wxDateTime::WeekDay m_wday;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalendarEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCalendarEvent);
};
// ----------------------------------------------------------------------------

4
include/wx/choicebk.h
View File

@ -102,8 +102,8 @@ protected:
void OnChoiceSelected(wxCommandEvent& event);
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook);
};
// ----------------------------------------------------------------------------

2
include/wx/clipbrd.h
View File

@ -126,7 +126,7 @@ public:
protected:
wxVector<wxDataFormat> m_formats;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent);
};
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );

4
include/wx/clrpicker.h
View File

@ -149,7 +149,7 @@ protected:
{ return (style & wxCLRP_SHOW_LABEL); }
private:
DECLARE_DYNAMIC_CLASS(wxColourPickerCtrl)
wxDECLARE_DYNAMIC_CLASS(wxColourPickerCtrl);
};
@ -180,7 +180,7 @@ public:
private:
wxColour m_colour;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent);
};
// ----------------------------------------------------------------------------

4
include/wx/cmdproc.h
View File

@ -41,7 +41,7 @@ protected:
wxString m_commandName;
private:
DECLARE_CLASS(wxCommand)
wxDECLARE_CLASS(wxCommand);
};
// ----------------------------------------------------------------------------
@ -132,7 +132,7 @@ protected:
wxString m_redoAccelerator;
private:
DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
wxDECLARE_DYNAMIC_CLASS(wxCommandProcessor);
wxDECLARE_NO_COPY_CLASS(wxCommandProcessor);
};

6
include/wx/cmndata.h
View File

@ -138,7 +138,7 @@ private:
wxPrintNativeDataBase *m_nativeData;
private:
DECLARE_DYNAMIC_CLASS(wxPrintData)
wxDECLARE_DYNAMIC_CLASS(wxPrintData);
};
/*
@ -213,7 +213,7 @@ private:
wxPrintData m_printData;
private:
DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
wxDECLARE_DYNAMIC_CLASS(wxPrintDialogData);
};
/*
@ -302,7 +302,7 @@ private:
wxPrintData m_printData;
private:
DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
wxDECLARE_DYNAMIC_CLASS(wxPageSetupDialogData);
};
#endif // wxUSE_PRINTING_ARCHITECTURE

2
include/wx/collpane.h
View File

@ -75,7 +75,7 @@ public:
private:
bool m_bCollapsed;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCollapsiblePaneEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCollapsiblePaneEvent);
};
// ----------------------------------------------------------------------------

2
include/wx/colourdata.h
View File

@ -45,7 +45,7 @@ public:
wxColour m_custColours[NUM_CUSTOM];
bool m_chooseFull;
DECLARE_DYNAMIC_CLASS(wxColourData)
wxDECLARE_DYNAMIC_CLASS(wxColourData);
};
#endif // _WX_COLOURDATA_H_

4
include/wx/combo.h
View File

@ -728,9 +728,9 @@ private:
// Is popup window wxPopupTransientWindow, wxPopupWindow or wxDialog?
wxByte m_popupWinType;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
DECLARE_ABSTRACT_CLASS(wxComboCtrlBase)
wxDECLARE_ABSTRACT_CLASS(wxComboCtrlBase);
};

2
include/wx/confbase.h
View File

@ -401,7 +401,7 @@ private:
// Style flag
long m_style;
DECLARE_ABSTRACT_CLASS(wxConfigBase)
wxDECLARE_ABSTRACT_CLASS(wxConfigBase);
};
// a handy little class which changes current path to the path of given entry

6
include/wx/cshelp.h
View File

@ -54,7 +54,7 @@ protected:
bool m_status; // true if the user left-clicked
private:
DECLARE_DYNAMIC_CLASS(wxContextHelp)
wxDECLARE_DYNAMIC_CLASS(wxContextHelp);
};
#if wxUSE_BMPBUTTON
@ -89,8 +89,8 @@ public:
void OnContextHelp(wxCommandEvent& event);
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxContextHelpButton);
wxDECLARE_EVENT_TABLE();
};
#endif

2
include/wx/ctrlsub.h
View File

@ -492,7 +492,7 @@ private:
wxControlWithItems() { }
private:
DECLARE_ABSTRACT_CLASS(wxControlWithItems)
wxDECLARE_ABSTRACT_CLASS(wxControlWithItems);
wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
};
#endif

12
include/wx/dataview.h
View File

@ -755,7 +755,7 @@ private:
int m_indent ;
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase);
};
// ----------------------------------------------------------------------------
@ -879,7 +879,7 @@ protected:
#endif // wxUSE_DRAG_AND_DROP
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent);
};
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent );
@ -1117,8 +1117,8 @@ public:
void OnSize( wxSizeEvent &event );
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewListCtrl)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewListCtrl);
};
//-----------------------------------------------------------------------------
@ -1342,8 +1342,8 @@ public:
void OnSize( wxSizeEvent &event );
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl);
};
// old wxEVT_COMMAND_* constants

2
include/wx/datectrl.h
View File

@ -103,7 +103,7 @@ public:
}
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl);
};
#endif

2
include/wx/dateevt.h
View File

@ -39,7 +39,7 @@ public:
private:
wxDateTime m_date;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDateEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDateEvent);
};
// ----------------------------------------------------------------------------

4
include/wx/dc.h
View File

@ -776,7 +776,7 @@ protected:
#endif // wxUSE_PALETTE
private:
DECLARE_ABSTRACT_CLASS(wxDCImpl)
wxDECLARE_ABSTRACT_CLASS(wxDCImpl);
};
@ -1373,7 +1373,7 @@ protected:
wxDCImpl * const m_pimpl;
private:
DECLARE_ABSTRACT_CLASS(wxDC)
wxDECLARE_ABSTRACT_CLASS(wxDC);
wxDECLARE_NO_COPY_CLASS(wxDC);
};

4
include/wx/dcbuffer.h
View File

@ -135,7 +135,7 @@ private:
wxSize m_area;
DECLARE_DYNAMIC_CLASS(wxBufferedDC)
wxDECLARE_DYNAMIC_CLASS(wxBufferedDC);
wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
};
@ -195,7 +195,7 @@ protected:
private:
wxPaintDC m_paintdc;
DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC)
wxDECLARE_ABSTRACT_CLASS(wxBufferedPaintDC);
wxDECLARE_NO_COPY_CLASS(wxBufferedPaintDC);
};

6
include/wx/dcclient.h
View File

@ -24,7 +24,7 @@ protected:
wxWindowDC(wxDCImpl *impl) : wxDC(impl) { }
private:
DECLARE_ABSTRACT_CLASS(wxWindowDC)
wxDECLARE_ABSTRACT_CLASS(wxWindowDC);
};
//-----------------------------------------------------------------------------
@ -40,7 +40,7 @@ protected:
wxClientDC(wxDCImpl *impl) : wxWindowDC(impl) { }
private:
DECLARE_ABSTRACT_CLASS(wxClientDC)
wxDECLARE_ABSTRACT_CLASS(wxClientDC);
};
//-----------------------------------------------------------------------------
@ -56,7 +56,7 @@ protected:
wxPaintDC(wxDCImpl *impl) : wxClientDC(impl) { }
private:
DECLARE_ABSTRACT_CLASS(wxPaintDC)
wxDECLARE_ABSTRACT_CLASS(wxPaintDC);
};
#endif // _WX_DCCLIENT_H_BASE_

4
include/wx/dcgraph.h
View File

@ -47,7 +47,7 @@ public:
#endif // __WXMSW__
private:
DECLARE_DYNAMIC_CLASS(wxGCDC)
wxDECLARE_DYNAMIC_CLASS(wxGCDC);
wxDECLARE_NO_COPY_CLASS(wxGCDC);
};
@ -218,7 +218,7 @@ protected:
private:
void Init(wxGraphicsContext*);
DECLARE_CLASS(wxGCDCImpl)
wxDECLARE_CLASS(wxGCDCImpl);
wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
};

2
include/wx/dcmemory.h
View File

@ -36,7 +36,7 @@ public:
wxBitmap& GetSelectedBitmap();
private:
DECLARE_DYNAMIC_CLASS(wxMemoryDC)
wxDECLARE_DYNAMIC_CLASS(wxMemoryDC);
};

2
include/wx/dcprint.h
View File

@ -34,7 +34,7 @@ protected:
wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { }
private:
DECLARE_DYNAMIC_CLASS(wxPrinterDC)
wxDECLARE_DYNAMIC_CLASS(wxPrinterDC);
};
#endif // wxUSE_PRINTING_ARCHITECTURE

2
include/wx/dcscreen.h
View File

@ -27,7 +27,7 @@ public:
{ return true; }
private:
DECLARE_DYNAMIC_CLASS(wxScreenDC)
wxDECLARE_DYNAMIC_CLASS(wxScreenDC);
};

2
include/wx/dcsvg.h
View File

@ -242,7 +242,7 @@ private:
// incremented in each SetClippingRegion() call.
size_t m_clipUniqueId;
DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl)
wxDECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl);
};

2
include/wx/dfb/app.h
View File

@ -38,7 +38,7 @@ public:
private:
wxVideoMode m_videoMode;
DECLARE_DYNAMIC_CLASS(wxApp)
wxDECLARE_DYNAMIC_CLASS(wxApp);
};
#endif // _WX_DFB_APP_H_

2
include/wx/dfb/bitmap.h
View File

@ -88,7 +88,7 @@ protected:
bool CreateWithFormat(int width, int height, int dfbFormat);
DECLARE_DYNAMIC_CLASS(wxBitmap)
wxDECLARE_DYNAMIC_CLASS(wxBitmap);
};
#endif // _WX_DFB_BITMAP_H_

2
include/wx/dfb/brush.h
View File

@ -57,7 +57,7 @@ protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
DECLARE_DYNAMIC_CLASS(wxBrush)
wxDECLARE_DYNAMIC_CLASS(wxBrush);
};
#endif // _WX_DFB_BRUSH_H_

2
include/wx/dfb/cursor.h
View File

@ -38,7 +38,7 @@ protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
DECLARE_DYNAMIC_CLASS(wxCursor)
wxDECLARE_DYNAMIC_CLASS(wxCursor);
};
#endif // _WX_DFB_CURSOR_H_

2
include/wx/dfb/dc.h
View File

@ -161,7 +161,7 @@ protected:
friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init
DECLARE_ABSTRACT_CLASS(wxDFBDCImpl)
wxDECLARE_ABSTRACT_CLASS(wxDFBDCImpl);
};
#endif // _WX_DFB_DC_H_

6
include/wx/dfb/dcclient.h
View File

@ -37,7 +37,7 @@ private:
friend class wxOverlayImpl; // for m_shouldFlip;
DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
wxDECLARE_DYNAMIC_CLASS(wxWindowDCImpl);
wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
};
@ -51,7 +51,7 @@ public:
wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
wxClientDCImpl(wxDC *owner, wxWindow *win);
DECLARE_DYNAMIC_CLASS(wxClientDCImpl)
wxDECLARE_DYNAMIC_CLASS(wxClientDCImpl);
wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
};
@ -66,7 +66,7 @@ public:
wxPaintDCImpl(wxDC *owner) : wxClientDCImpl(owner) { }
wxPaintDCImpl(wxDC *owner, wxWindow *win) : wxClientDCImpl(owner, win) { }
DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
wxDECLARE_DYNAMIC_CLASS(wxPaintDCImpl);
wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
};

2
include/wx/dfb/dcmemory.h
View File

@ -30,7 +30,7 @@ private:
wxBitmap m_bmp;
DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
wxDECLARE_DYNAMIC_CLASS(wxMemoryDCImpl);
};
#endif // _WX_DFB_DCMEMORY_H_

2
include/wx/dfb/dcscreen.h
View File

@ -17,7 +17,7 @@ class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxDFBDCImpl
public:
wxScreenDCImpl(wxScreenDC *owner);
DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
wxDECLARE_DYNAMIC_CLASS(wxScreenDCImpl);
};
#endif // _WX_DFB_DCSCREEN_H_

2
include/wx/dfb/font.h
View File

@ -114,7 +114,7 @@ protected:
virtual wxFontFamily DoGetFamily() const;
private:
DECLARE_DYNAMIC_CLASS(wxFont)
wxDECLARE_DYNAMIC_CLASS(wxFont);
};
#endif // _WX_DFB_FONT_H_

2
include/wx/dfb/pen.h
View File

@ -68,7 +68,7 @@ protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
DECLARE_DYNAMIC_CLASS(wxPen)
wxDECLARE_DYNAMIC_CLASS(wxPen);
};
#endif // _WX_DFB_PEN_H_

2
include/wx/dfb/popupwin.h
View File

@ -37,7 +37,7 @@ public:
);
}
DECLARE_DYNAMIC_CLASS(wxPopupWindow)
wxDECLARE_DYNAMIC_CLASS(wxPopupWindow);
};
#endif // _WX_DFB_POPUPWIN_H_

4
include/wx/dfb/region.h
View File

@ -58,7 +58,7 @@ protected:
friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
DECLARE_DYNAMIC_CLASS(wxRegion);
wxDECLARE_DYNAMIC_CLASS(wxRegion);
};
@ -88,7 +88,7 @@ public:
private:
wxRect m_rect;
DECLARE_DYNAMIC_CLASS(wxRegionIterator);
wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
};
#endif // _WX_DFB_REGION_H_

4
include/wx/dfb/window.h
View File

@ -185,9 +185,9 @@ private:
friend class wxOverlayImpl; // for Add/RemoveOverlay
friend class wxWindowDCImpl; // for PaintOverlays
DECLARE_DYNAMIC_CLASS(wxWindowDFB)
wxDECLARE_DYNAMIC_CLASS(wxWindowDFB);
wxDECLARE_NO_COPY_CLASS(wxWindowDFB);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif // _WX_DFB_WINDOW_H_

8
include/wx/dialog.h
View File

@ -270,7 +270,7 @@ private:
wxDECLARE_NO_COPY_CLASS(wxDialogBase);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
/*!
@ -282,7 +282,7 @@ private:
class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject
{
DECLARE_CLASS(wxDialogLayoutAdapter)
wxDECLARE_CLASS(wxDialogLayoutAdapter);
public:
wxDialogLayoutAdapter() {}
@ -300,7 +300,7 @@ public:
class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
{
DECLARE_CLASS(wxStandardDialogLayoutAdapter)
wxDECLARE_CLASS(wxStandardDialogLayoutAdapter);
public:
wxStandardDialogLayoutAdapter() {}
@ -380,7 +380,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowModalDialogEvent (*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent )
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent);
};
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent );

4
include/wx/docmdi.h
View File

@ -48,7 +48,7 @@ public:
}
private:
DECLARE_CLASS(wxDocMDIParentFrame)
wxDECLARE_CLASS(wxDocMDIParentFrame);
wxDECLARE_NO_COPY_CLASS(wxDocMDIParentFrame);
};
@ -79,7 +79,7 @@ public:
}
private:
DECLARE_CLASS(wxDocMDIChildFrame)
wxDECLARE_CLASS(wxDocMDIChildFrame);
wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame);
};

16
include/wx/docview.h
View File

@ -218,7 +218,7 @@ private:
typedef wxDList<wxDocument> DocsList;
DocsList m_childDocuments;
DECLARE_ABSTRACT_CLASS(wxDocument)
wxDECLARE_ABSTRACT_CLASS(wxDocument);
wxDECLARE_NO_COPY_CLASS(wxDocument);
};
@ -291,7 +291,7 @@ protected:
wxDocChildFrameAnyBase *m_docChildFrame;
private:
DECLARE_ABSTRACT_CLASS(wxView)
wxDECLARE_ABSTRACT_CLASS(wxView);
wxDECLARE_NO_COPY_CLASS(wxView);
};
@ -376,7 +376,7 @@ protected:
virtual wxView *DoCreateView();
private:
DECLARE_CLASS(wxDocTemplate)
wxDECLARE_CLASS(wxDocTemplate);
wxDECLARE_NO_COPY_CLASS(wxDocTemplate);
};
@ -562,8 +562,8 @@ protected:
wxPageSetupDialogData m_pageSetupDialogData;
#endif // wxUSE_PRINTING_ARCHITECTURE
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxDocManager)
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(wxDocManager);
wxDECLARE_NO_COPY_CLASS(wxDocManager);
};
@ -798,7 +798,7 @@ public:
}
private:
DECLARE_CLASS(wxDocChildFrame)
wxDECLARE_CLASS(wxDocChildFrame);
wxDECLARE_NO_COPY_CLASS(wxDocChildFrame);
};
@ -950,7 +950,7 @@ public:
}
private:
DECLARE_CLASS(wxDocParentFrame)
wxDECLARE_CLASS(wxDocParentFrame);
wxDECLARE_NO_COPY_CLASS(wxDocParentFrame);
};
@ -977,7 +977,7 @@ protected:
wxView* m_printoutView;
private:
DECLARE_DYNAMIC_CLASS(wxDocPrintout)
wxDECLARE_DYNAMIC_CLASS(wxDocPrintout);
wxDECLARE_NO_COPY_CLASS(wxDocPrintout);
};
#endif // wxUSE_PRINTING_ARCHITECTURE

4
include/wx/dvrenderers.h
View File

@ -72,7 +72,7 @@ private:
wxString m_text;
wxIcon m_icon;
DECLARE_DYNAMIC_CLASS(wxDataViewIconText)
wxDECLARE_DYNAMIC_CLASS(wxDataViewIconText);
};
DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
@ -188,7 +188,7 @@ protected:
wxDataViewCtrl* GetView() const;
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase);
};
// include the real wxDataViewRenderer declaration for the native ports

4
include/wx/editlbox.h
View File

@ -86,8 +86,8 @@ protected:
void OnUpItem(wxCommandEvent& event);
void OnDownItem(wxCommandEvent& event);
DECLARE_CLASS(wxEditableListBox)
DECLARE_EVENT_TABLE()
wxDECLARE_CLASS(wxEditableListBox);
wxDECLARE_EVENT_TABLE();
private:
void SwapItems(long i1, long i2);

2
include/wx/effects.h
View File

@ -74,7 +74,7 @@ protected:
wxColour m_mediumShadow; // Usually dark grey
wxColour m_darkShadow; // Usually black
DECLARE_CLASS(wxEffectsImpl)
wxDECLARE_CLASS(wxEffectsImpl);
};
// current versions of g++ don't generate deprecation warnings for classes

80
include/wx/event.h
View File

@ -1054,7 +1054,7 @@ private:
friend class WXDLLIMPEXP_FWD_BASE wxEventProcessInHandlerOnly;
DECLARE_ABSTRACT_CLASS(wxEvent)
wxDECLARE_ABSTRACT_CLASS(wxEvent);
};
/*
@ -1242,7 +1242,7 @@ protected:
static wxIdleMode sm_idleMode;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent);
};
@ -1276,7 +1276,7 @@ public:
{ return wxEVT_CATEGORY_THREAD; }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent);
};
@ -1557,7 +1557,7 @@ private:
m_propagationLevel = wxEVENT_PROPAGATE_MAX;
}
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent);
};
// this class adds a possibility to react (from the user) code to a control
@ -1588,7 +1588,7 @@ private:
bool m_bAllow;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent);
};
@ -1620,7 +1620,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent);
};
// ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
@ -1657,7 +1657,7 @@ protected:
long m_extraLong;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent);
};
@ -1815,7 +1815,7 @@ protected:
void Assign(const wxMouseEvent& evt);
private:
DECLARE_DYNAMIC_CLASS(wxMouseEvent)
wxDECLARE_DYNAMIC_CLASS(wxMouseEvent);
};
// Cursor set event
@ -1853,7 +1853,7 @@ private:
wxCursor m_cursor;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent);
};
// Keyboard input event class
@ -2037,7 +2037,7 @@ private:
// when they're requested.
bool m_hasPosition;
DECLARE_DYNAMIC_CLASS(wxKeyEvent)
wxDECLARE_DYNAMIC_CLASS(wxKeyEvent);
};
// Size event class
@ -2075,7 +2075,7 @@ public:
wxRect m_rect; // Used for wxEVT_SIZING
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSizeEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSizeEvent);
};
// Move event class
@ -2114,7 +2114,7 @@ protected:
wxRect m_rect;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMoveEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMoveEvent);
};
// Paint event class
@ -2160,7 +2160,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaintEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent);
};
class WXDLLIMPEXP_CORE wxNcPaintEvent : public wxEvent
@ -2173,7 +2173,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxNcPaintEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent);
};
// Erase background event class
@ -2202,7 +2202,7 @@ protected:
wxDC *m_dc;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxEraseEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxEraseEvent);
};
// Focus event class
@ -2234,7 +2234,7 @@ private:
wxWindow *m_win;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFocusEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFocusEvent);
};
// wxChildFocusEvent notifies the parent that a child has got the focus: unlike
@ -2249,7 +2249,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxChildFocusEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent);
};
// Activate event class
@ -2294,7 +2294,7 @@ private:
Reason m_activationReason;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent);
};
// InitDialog event class
@ -2312,7 +2312,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxInitDialogEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent);
};
// Miscellaneous menu event class
@ -2347,7 +2347,7 @@ private:
int m_menuId;
wxMenu* m_menu;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMenuEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMenuEvent);
};
// Window close or session close event class
@ -2403,7 +2403,7 @@ protected:
m_canVeto;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCloseEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCloseEvent);
};
/*
@ -2435,7 +2435,7 @@ protected:
bool m_show;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxShowEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxShowEvent);
};
/*
@ -2464,7 +2464,7 @@ protected:
bool m_iconized;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIconizeEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIconizeEvent);
};
/*
wxEVT_MAXIMIZE
@ -2480,7 +2480,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxMaximizeEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent);
};
// Joystick event class
@ -2579,7 +2579,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxJoystickEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent);
};
// Drop files event class
@ -2629,7 +2629,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxDropFilesEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent);
};
// Update UI event
@ -2731,7 +2731,7 @@ protected:
static wxUpdateUIMode sm_updateMode;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxUpdateUIEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxUpdateUIEvent);
};
/*
@ -2749,7 +2749,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxSysColourChangedEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent);
};
/*
@ -2778,7 +2778,7 @@ public:
private:
wxWindow* m_gainedCapture;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureChangedEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureChangedEvent);
};
/*
@ -2801,7 +2801,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureLostEvent(*this); }
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent);
};
/*
@ -2810,7 +2810,7 @@ public:
class WXDLLIMPEXP_CORE wxDisplayChangedEvent : public wxEvent
{
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDisplayChangedEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDisplayChangedEvent);
public:
wxDisplayChangedEvent()
@ -2846,7 +2846,7 @@ protected:
wxWindow* m_changedWindow;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaletteChangedEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaletteChangedEvent);
};
/*
@ -2876,7 +2876,7 @@ protected:
bool m_paletteRealized;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryNewPaletteEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryNewPaletteEvent);
};
/*
@ -2943,7 +2943,7 @@ public:
wxWindow *m_focus;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNavigationKeyEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNavigationKeyEvent);
};
// Window creation/destruction events: the first is sent as soon as window is
@ -2966,7 +2966,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowCreateEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent);
};
class WXDLLIMPEXP_CORE wxWindowDestroyEvent : public wxCommandEvent
@ -2979,7 +2979,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowDestroyEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent);
};
// A help event is sent when the user clicks on a window in context-help mode.
@ -3044,7 +3044,7 @@ protected:
static Origin GuessOrigin(Origin origin);
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHelpEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHelpEvent);
};
// A Clipboard Text event is sent when a window intercepts text copy/cut/paste
@ -3072,7 +3072,7 @@ public:
virtual wxEvent *Clone() const wxOVERRIDE { return new wxClipboardTextEvent(*this); }
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent);
};
// A Context event is sent when the user right clicks on a window or
@ -3107,7 +3107,7 @@ protected:
wxPoint m_pos;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent);
};
@ -3726,7 +3726,7 @@ private:
// Head of the event filter linked list.
static wxEventFilter* ms_filterList;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler);
};
WX_DEFINE_ARRAY_WITH_DECL_PTR(wxEvtHandler *, wxEvtHandlerArray, class WXDLLIMPEXP_BASE);

2
include/wx/fdrepdlg.h
View File

@ -161,7 +161,7 @@ public:
private:
wxString m_strReplace;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent);
};
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FIND, wxFindDialogEvent );

2
include/wx/fileconf.h
View File

@ -252,7 +252,7 @@ private:
bool m_isDirty; // if true, we have unsaved changes
wxDECLARE_NO_COPY_CLASS(wxFileConfig);
DECLARE_ABSTRACT_CLASS(wxFileConfig)
wxDECLARE_ABSTRACT_CLASS(wxFileConfig);
};
#endif

2
include/wx/filectrl.h
View File

@ -115,7 +115,7 @@ protected:
wxString m_directory;
wxArrayString m_files;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN( wxFileCtrlEvent )
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileCtrlEvent);
};
typedef void ( wxEvtHandler::*wxFileCtrlEventFunction )( wxFileCtrlEvent& );

2
include/wx/filedlg.h
View File

@ -167,7 +167,7 @@ private:
ExtraControlCreatorFunction m_extraControlCreator;
void Init();
DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
wxDECLARE_DYNAMIC_CLASS(wxFileDialogBase);
wxDECLARE_NO_COPY_CLASS(wxFileDialogBase);
};

2
include/wx/filehistory.h
View File

@ -94,7 +94,7 @@ private:
wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1)
: wxFileHistoryBase(maxFiles, idBase) {}
DECLARE_DYNAMIC_CLASS(wxFileHistory)
wxDECLARE_DYNAMIC_CLASS(wxFileHistory);
};
#endif

6
include/wx/filepicker.h
View File

@ -55,7 +55,7 @@ public:
private:
wxString m_path;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent);
};
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );
@ -310,7 +310,7 @@ protected:
}
private:
DECLARE_DYNAMIC_CLASS(wxFilePickerCtrl)
wxDECLARE_DYNAMIC_CLASS(wxFilePickerCtrl);
};
#endif // wxUSE_FILEPICKERCTRL
@ -407,7 +407,7 @@ protected:
}
private:
DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl)
wxDECLARE_DYNAMIC_CLASS(wxDirPickerCtrl);
};
#endif // wxUSE_DIRPICKERCTRL

6
include/wx/filesys.h
View File

@ -97,7 +97,7 @@ private:
wxDateTime m_Modif;
#endif // wxUSE_DATETIME
DECLARE_ABSTRACT_CLASS(wxFSFile)
wxDECLARE_ABSTRACT_CLASS(wxFSFile);
wxDECLARE_NO_COPY_CLASS(wxFSFile);
};
@ -154,7 +154,7 @@ protected:
// {it returns "/README.txt" for "file:subdir/archive.tar.gz#tar:/README.txt"}
static wxString GetRightLocation(const wxString& location);
DECLARE_ABSTRACT_CLASS(wxFileSystemHandler)
wxDECLARE_ABSTRACT_CLASS(wxFileSystemHandler);
};
@ -245,7 +245,7 @@ protected:
wxFSHandlerHash m_LocalHandlers;
// Handlers local to this instance
DECLARE_DYNAMIC_CLASS(wxFileSystem)
wxDECLARE_DYNAMIC_CLASS(wxFileSystem);
wxDECLARE_NO_COPY_CLASS(wxFileSystem);
};

2
include/wx/fontdata.h
View File

@ -64,7 +64,7 @@ private:
wxFontEncoding m_encoding;
wxNativeEncodingInfo m_encodingInfo;
DECLARE_DYNAMIC_CLASS(wxFontData)
wxDECLARE_DYNAMIC_CLASS(wxFontData);
};
#endif // _WX_FONTDATA_H_

4
include/wx/fontpicker.h
View File

@ -180,7 +180,7 @@ private:
wxFontPickerWidget* GetPickerWidget() const
{ return static_cast<wxFontPickerWidget*>(m_picker); }
DECLARE_DYNAMIC_CLASS(wxFontPickerCtrl)
wxDECLARE_DYNAMIC_CLASS(wxFontPickerCtrl);
};
@ -210,7 +210,7 @@ public:
private:
wxFont m_font;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFontPickerEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFontPickerEvent);
};
// ----------------------------------------------------------------------------

2
include/wx/frame.h
View File

@ -244,7 +244,7 @@ protected:
#endif // wxUSE_TOOLBAR
#if wxUSE_MENUS && wxUSE_STATUSBAR
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
#endif // wxUSE_MENUS && wxUSE_STATUSBAR
wxDECLARE_NO_COPY_CLASS(wxFrameBase);

2
include/wx/fs_arc.h
View File

@ -47,7 +47,7 @@ private:
wxString DoFind();
wxDECLARE_NO_COPY_CLASS(wxArchiveFSHandler);
DECLARE_DYNAMIC_CLASS(wxArchiveFSHandler)
wxDECLARE_DYNAMIC_CLASS(wxArchiveFSHandler);
};
#endif // wxUSE_FS_ARCHIVE

2
include/wx/fswatcher.h
View File

@ -205,7 +205,7 @@ protected:
wxFileName m_newPath;
wxString m_errorMsg;
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileSystemWatcherEvent)
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileSystemWatcherEvent);
};
typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction)

4
include/wx/gbsizer.h
View File

@ -195,7 +195,7 @@ protected:
private:
DECLARE_DYNAMIC_CLASS(wxGBSizerItem)
wxDECLARE_DYNAMIC_CLASS(wxGBSizerItem);
wxDECLARE_NO_COPY_CLASS(wxGBSizerItem);
};
@ -333,7 +333,7 @@ protected:
private:
DECLARE_CLASS(wxGridBagSizer)
wxDECLARE_CLASS(wxGridBagSizer);
wxDECLARE_NO_COPY_CLASS(wxGridBagSizer);
};

2
include/wx/gdiobj.h
View File

@ -86,7 +86,7 @@ protected:
virtual wxGDIRefData *CreateGDIRefData() const = 0;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const = 0;
DECLARE_DYNAMIC_CLASS(wxGDIObject)
wxDECLARE_DYNAMIC_CLASS(wxGDIObject);
};
#endif // _WX_GDIOBJ_H_BASE_

2
include/wx/generic/accel.h
View File

@ -42,7 +42,7 @@ protected:
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
private:
DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
};
#endif // _WX_GENERIC_ACCEL_H_

6
include/wx/generic/animate.h
View File

@ -58,7 +58,7 @@ public:
static void CleanUpHandlers();
static void InitStandardHandlers();
DECLARE_DYNAMIC_CLASS(wxAnimation)
wxDECLARE_DYNAMIC_CLASS(wxAnimation);
};
@ -170,8 +170,8 @@ protected:
private:
typedef wxAnimationCtrlBase base_type;
DECLARE_DYNAMIC_CLASS(wxAnimationCtrl)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl);
wxDECLARE_EVENT_TABLE();
};
#endif // _WX_GENERIC_ANIMATEH__

4
include/wx/generic/bmpcbox.h
View File

@ -128,9 +128,9 @@ private:
void Init();
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
DECLARE_DYNAMIC_CLASS(wxBitmapComboBox)
wxDECLARE_DYNAMIC_CLASS(wxBitmapComboBox);
};
#endif // _WX_GENERIC_BMPCBOX_H_

4
include/wx/generic/buttonbar.h
View File

@ -114,8 +114,8 @@ private:
int m_labelMargin;
private:
DECLARE_DYNAMIC_CLASS(wxButtonToolBar)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(wxButtonToolBar);
wxDECLARE_EVENT_TABLE();
};
#endif

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