Canvas: added some DECLARE_CLASS macros to stop it failing

in class info initialisation
Mmedia: compiles agin
Plot: corrected VC++ project settings
Simple toolbar: should draw a highlight again now
Generic dir control: moved control ids to header for apps that
need to get hold of the individual controls
Scintilla: unconditionally compile Scintilla_LinkLexers() to correct
link error in sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-08 10:50:14 +00:00
parent 07d2031dde
commit a977709b11
12 changed files with 35 additions and 20 deletions

View File

@@ -54,6 +54,7 @@ enum wxDRAG_MODE
// alteration of a wxCanvasObject functionality
class wxCanvasObject: public wxEvtHandler
{
DECLARE_CLASS(wxCanvasObject)
public:
wxCanvasObject();
@@ -214,6 +215,7 @@ protected:
// The group has a matrix to position/rotate/scale the group.
class wxCanvasObjectGroup: public wxCanvasObject
{
DECLARE_CLASS(wxCanvasObjectGroup)
public:
wxCanvasObjectGroup(double x, double y);
virtual ~wxCanvasObjectGroup();
@@ -282,6 +284,7 @@ protected:
// The position/matrix of the referenced Object is accumulated with the one here.
class wxCanvasObjectRef: public wxCanvasObject
{
DECLARE_CLASS(wxCanvasObjectRef)
public:
wxCanvasObjectRef(double x, double y,wxCanvasObject* obj);
@@ -332,6 +335,7 @@ protected:
// wxCanvasRect
class wxCanvasRect: public wxCanvasObject
{
DECLARE_CLASS(wxCanvasRect)
public:
wxCanvasRect( double x, double y, double w, double h , double radius=0 );
void SetBrush( const wxBrush& brush) { m_brush = brush; };