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

Canvas: added some DECLARE_CLASS macros to stop it failing

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/include/wx/canvas/canvas.h
View File

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

2
contrib/samples/canvas/simple/simple.cpp
View File

@@ -71,7 +71,7 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
// Bunch of rects and images. // Bunch of rects and images.
wxBitmap bitmap( smile_xpm ); wxBitmap bitmap( smile_xpm );
wxImage image( bitmap ); wxImage image( bitmap.ConvertToImage() );
m_smile1 = new wxCanvasImage( image, 0,70,32,32 ); m_smile1 = new wxCanvasImage( image, 0,70,32,32 );
root->Append( m_smile1 ); root->Append( m_smile1 );

2
contrib/samples/canvas/test/test.cpp
View File

@@ -235,7 +235,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
m_datatree->SetAdmin(&m_canvasadmin); m_datatree->SetAdmin(&m_canvasadmin);
wxBitmap bitmap( smile_xpm ); wxBitmap bitmap( smile_xpm );
wxImage image( bitmap ); wxImage image( bitmap.ConvertToImage() );
// m_sm1 = new wxCanvasImage( image, 0,70,32,32 ); // m_sm1 = new wxCanvasImage( image, 0,70,32,32 );
// m_datatree->Append( m_sm1 ); // m_datatree->Append( m_sm1 );

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

@@ -312,18 +312,18 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
// Bitmap button panel // Bitmap button panel
wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
wxBitmap *play_bmp = new wxBitmap(play_back_xpm); wxBitmap play_bmp(play_back_xpm);
wxBitmap *stop_bmp = new wxBitmap(stop_back_xpm); wxBitmap stop_bmp(stop_back_xpm);
wxBitmap *eject_bmp = new wxBitmap(eject_xpm); wxBitmap eject_bmp(eject_xpm);
wxBitmap *pause_bmp = new wxBitmap(pause_xpm); wxBitmap pause_bmp(pause_xpm);
m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, *play_bmp); m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, play_bmp);
m_playButton->Enable(FALSE); m_playButton->Enable(FALSE);
m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, *pause_bmp); m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, pause_bmp);
m_pauseButton->Enable(FALSE); m_pauseButton->Enable(FALSE);
m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, *stop_bmp); m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, stop_bmp);
m_stopButton->Enable(FALSE); m_stopButton->Enable(FALSE);
m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, *eject_bmp); m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, eject_bmp);
m_ejectButton->Enable(FALSE); m_ejectButton->Enable(FALSE);
buttonSizer->Add(m_playButton, 0, wxALL, 2); buttonSizer->Add(m_playButton, 0, wxALL, 2);

4
contrib/samples/plot/PlotVC.dsp
View File

@@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswd" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -72,7 +72,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

8
contrib/src/canvas/canvas.cpp
View File

@@ -51,6 +51,8 @@ FT_Library g_freetypeLibrary;
// wxCanvasObject // wxCanvasObject
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxCanvasObject, wxEvtHandler)
wxCanvasObject::wxCanvasObject() wxCanvasObject::wxCanvasObject()
{ {
// the default event handler is just this object // the default event handler is just this object
@@ -407,6 +409,8 @@ void wxCanvasObject::WriteSVG( wxTextOutputStream &stream )
// wxCanvasObjectGroup // wxCanvasObjectGroup
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxCanvasObjectGroup, wxCanvasObject)
wxCanvasObjectGroup::wxCanvasObjectGroup(double x, double y) wxCanvasObjectGroup::wxCanvasObjectGroup(double x, double y)
{ {
lworld.Translate(x,y); lworld.Translate(x,y);
@@ -716,6 +720,8 @@ int wxCanvasObjectGroup::IndexOf( wxCanvasObject* obj )
// wxCanvasObjectRef // wxCanvasObjectRef
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxCanvasObjectRef, wxCanvasObject)
wxCanvasObjectRef::wxCanvasObjectRef(double x, double y, wxCanvasObject* obj) wxCanvasObjectRef::wxCanvasObjectRef(double x, double y, wxCanvasObject* obj)
: wxCanvasObject() : wxCanvasObject()
{ {
@@ -880,6 +886,8 @@ wxCanvasObject* wxCanvasObjectRef::IsHitWorld( double x, double y, double margin
// wxCanvasRect // wxCanvasRect
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
IMPLEMENT_CLASS(wxCanvasRect, wxCanvasObject)
wxCanvasRect::wxCanvasRect( double x, double y, double w, double h , double radius ) wxCanvasRect::wxCanvasRect( double x, double y, double w, double h , double radius )
: wxCanvasObject() : wxCanvasObject()
{ {

2
contrib/src/stc/scintilla/src/KeyWords.cxx
View File

@@ -97,7 +97,7 @@ static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[
LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null"); LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null");
#ifdef __vms #if 1 // def __vms
#define LINK_LEXERS #define LINK_LEXERS
#endif #endif

2
docs/latex/wx/wx.hpj
View File

@@ -1,5 +1,5 @@
[OPTIONS] [OPTIONS]
BMROOT=c:\wx2dev\wxwind~1\docs/latex/wx ; Assume that bitmaps are where the source is BMROOT=c:\wx2dev\wxWind~1\docs\latex\wx
TITLE=wxWindows Manual TITLE=wxWindows Manual
CONTENTS=Contents CONTENTS=Contents
COMPRESS=HIGH COMPRESS=HIGH

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

@@ -223,6 +223,10 @@ protected:
#define wxDirCtrl wxGenericDirCtrl #define wxDirCtrl wxGenericDirCtrl
#endif #endif
// Symbols for accessing individual controls
#define wxID_TREECTRL 7000
#define wxID_FILTERLISTCTRL 7001
#endif // wxUSE_DIRDLG #endif // wxUSE_DIRDLG
#endif #endif

3
src/generic/dirctrlg.cpp
View File

@@ -312,9 +312,6 @@ static const char * icon8_xpm[] = {
" "}; " "};
#define wxID_TREECTRL 7000
#define wxID_FILTERLISTCTRL 7001
#if defined(__DOS__) #if defined(__DOS__)
bool wxIsDriveAvailable(const wxString& dirName) bool wxIsDriveAvailable(const wxString& dirName)

6
src/generic/tbarsmpl.cpp
View File

@@ -514,9 +514,11 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
wxPen white_pen(wxT("WHITE"), 1, wxSOLID); wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
wxPen black_pen(wxT("BLACK"), 1, wxSOLID); wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
wxBitmap bitmap = tool->GetBitmap(); wxBitmap bitmap = tool->GetNormalBitmap();
if (!bitmap.Ok())
return;
if ( bitmap.Ok() ) if ( !tool->IsToggled() )
{ {
#if wxUSE_PALETTE #if wxUSE_PALETTE
#ifndef __WXGTK__ #ifndef __WXGTK__

2
src/stc/scintilla/src/KeyWords.cxx
View File

@@ -97,7 +97,7 @@ static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[
LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null"); LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null");
#ifdef __vms #if 1 // def __vms
#define LINK_LEXERS #define LINK_LEXERS
#endif #endif