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

diff --git a/contrib/include/wx/canvas/canvas.h b/contrib/include/wx/canvas/canvas.h
index 521c27ef86911d02e6d50faee1c4c9f12b066e29..37d900ded1a15fdca06e627d27a7d316dcfa4e90 100644 (file)
--- a/contrib/include/wx/canvas/canvas.h
+++ b/contrib/include/wx/canvas/canvas.h
@@ -54,6 +54,7 @@ enum wxDRAG_MODE
 // alteration of a  wxCanvasObject functionality
 class wxCanvasObject: public wxEvtHandler
 {
 // alteration of a  wxCanvasObject functionality
 class wxCanvasObject: public wxEvtHandler
 {

+    DECLARE_CLASS(wxCanvasObject)

 public:
 
     wxCanvasObject();
 public:
 
     wxCanvasObject();


@@ -214,6 +215,7 @@ protected:
 // The group has a matrix to position/rotate/scale the group.
 class wxCanvasObjectGroup: public wxCanvasObject
 {
 // 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();
 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
 {
 // 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);
 
 public:
     wxCanvasObjectRef(double x, double y,wxCanvasObject* obj);
 


@@ -332,6 +335,7 @@ protected:
 // wxCanvasRect
 class wxCanvasRect: public wxCanvasObject
 {
 // 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; };
 public:
     wxCanvasRect( double x, double y, double w, double h , double radius=0 );
     void SetBrush( const wxBrush& brush)  { m_brush = brush; };

diff --git a/contrib/samples/canvas/simple/simple.cpp b/contrib/samples/canvas/simple/simple.cpp
index 6bb5b8ac3e304bb9191703f9769ff7ab07b497a2..46385b28f1e64ac08cedc6878c7b64e4a6899baf 100644 (file)
--- a/contrib/samples/canvas/simple/simple.cpp
+++ b/contrib/samples/canvas/simple/simple.cpp
@@ -71,7 +71,7 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
 
     // Bunch of rects and images.
     wxBitmap bitmap( smile_xpm );
 
     // Bunch of rects and images.
     wxBitmap bitmap( smile_xpm );

-    wxImage image( bitmap );
+    wxImage image( bitmap.ConvertToImage() );

 
     m_smile1 = new wxCanvasImage( image, 0,70,32,32 );
     root->Append( m_smile1 );
 
     m_smile1 = new wxCanvasImage( image, 0,70,32,32 );
     root->Append( m_smile1 );

diff --git a/contrib/samples/canvas/test/test.cpp b/contrib/samples/canvas/test/test.cpp
index 410a3780bdcc24c12e427a04b38d5d4f14b471e1..ac52ef0f9f050c42c3760a8d6ca4c85609533c9b 100644 (file)
--- a/contrib/samples/canvas/test/test.cpp
+++ b/contrib/samples/canvas/test/test.cpp
@@ -235,7 +235,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
     m_datatree->SetAdmin(&m_canvasadmin);
 
     wxBitmap bitmap( smile_xpm );
     m_datatree->SetAdmin(&m_canvasadmin);
 
     wxBitmap bitmap( smile_xpm );

-    wxImage image( bitmap );
+    wxImage image( bitmap.ConvertToImage() );

 
 //    m_sm1 = new wxCanvasImage( image, 0,70,32,32 );
 //    m_datatree->Append( m_sm1 );
 
 //    m_sm1 = new wxCanvasImage( image, 0,70,32,32 );
 //    m_datatree->Append( m_sm1 );

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index b43c2e3011f17b73427b1bada3cf17da977fb914..a11274d13c54e2d40d1088b2743c432c655c7c02 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -312,18 +312,18 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
     // Bitmap button panel
     wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
     
     // Bitmap button panel
     wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
     

-    wxBitmap *play_bmp = new wxBitmap(play_back_xpm);
-    wxBitmap *stop_bmp = new wxBitmap(stop_back_xpm);
-    wxBitmap *eject_bmp = new wxBitmap(eject_xpm);
-    wxBitmap *pause_bmp = new wxBitmap(pause_xpm);
+    wxBitmap play_bmp(play_back_xpm);
+    wxBitmap stop_bmp(stop_back_xpm);
+    wxBitmap eject_bmp(eject_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);
     
     buttonSizer->Add(m_playButton, 0, wxALL, 2);
     m_ejectButton->Enable(FALSE);
     
     buttonSizer->Add(m_playButton, 0, wxALL, 2);

diff --git a/contrib/samples/plot/PlotVC.dsp b/contrib/samples/plot/PlotVC.dsp
index 758b8ddb1008f0d8141668585b70774f854808c7..39f842bcfd0dc158ada494f93058e9b3396c6068 100644 (file)
--- a/contrib/samples/plot/PlotVC.dsp
+++ b/contrib/samples/plot/PlotVC.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # SUBTRACT CPP /YX
 # ADD BASE 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 Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

diff --git a/contrib/src/canvas/canvas.cpp b/contrib/src/canvas/canvas.cpp
index 3853269f960b3c96d389297266955a5258de308e..0cedafc9468083b60472beab11888461ed896c12 100644 (file)
--- a/contrib/src/canvas/canvas.cpp
+++ b/contrib/src/canvas/canvas.cpp
@@ -51,6 +51,8 @@ FT_Library g_freetypeLibrary;
 // wxCanvasObject
 //----------------------------------------------------------------------------
 
 // wxCanvasObject
 //----------------------------------------------------------------------------
 

+IMPLEMENT_CLASS(wxCanvasObject, wxEvtHandler)
+

 wxCanvasObject::wxCanvasObject()
 {
     // the default event handler is just this object
 wxCanvasObject::wxCanvasObject()
 {
     // 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)
 {
     lworld.Translate(x,y);
 wxCanvasObjectGroup::wxCanvasObjectGroup(double x, double 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)
    : wxCanvasObject()
 {
 wxCanvasObjectRef::wxCanvasObjectRef(double x, double y, wxCanvasObject* obj)
    : 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 )
    : wxCanvasObject()
 {
 wxCanvasRect::wxCanvasRect( double x, double y, double w, double h , double radius )
    : wxCanvasObject()
 {

diff --git a/contrib/src/stc/scintilla/src/KeyWords.cxx b/contrib/src/stc/scintilla/src/KeyWords.cxx
index d1eddef5ff814bf16e1fb96cbe9ec8e8ab1f1532..804846e19e908e3d21b41e0ad130ecf37a1b85d7 100644 (file)
--- a/contrib/src/stc/scintilla/src/KeyWords.cxx
+++ b/contrib/src/stc/scintilla/src/KeyWords.cxx
@@ -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
 #endif
 
 #define LINK_LEXERS
 #endif
 

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 1430bcfb87d290cf4058ad51cec795cd270ef408..31ec7677b71affb37a04c951a37733fb86b0c8e8 100644 (file)
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -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
 CONTENTS=Contents
 COMPRESS=HIGH
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 467c04f7a4e056a8fb1e620febb6fe89f4e58b7f..4be293df3e21c03ff85441899432e23684a0a3e6 100644 (file)
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -223,6 +223,10 @@ protected:
     #define wxDirCtrl wxGenericDirCtrl
 #endif
 
     #define wxDirCtrl wxGenericDirCtrl
 #endif
 

+// Symbols for accessing individual controls
+#define wxID_TREECTRL          7000
+#define wxID_FILTERLISTCTRL    7001
+

 #endif // wxUSE_DIRDLG
 
 #endif
 #endif // wxUSE_DIRDLG
 
 #endif

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index dddbbad58759a6f3897e339740fab024a866fe97..6084a44bd23c88958c70ee91de0f4cf906ac6314 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -312,9 +312,6 @@ static const char * icon8_xpm[] = {
 "                "};
 
 
 "                "};
 
 

-#define wxID_TREECTRL          7000
-#define wxID_FILTERLISTCTRL    7001
-

 #if defined(__DOS__)
 
 bool wxIsDriveAvailable(const wxString& dirName)
 #if defined(__DOS__)
 
 bool wxIsDriveAvailable(const wxString& dirName)

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 543aff8fc5d038601954deaa075b3eb15e5b2bfd..522736e77f32f49162082d384766c18b7f08b509 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -514,9 +514,11 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
     wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
     wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
 
     wxPen white_pen(wxT("WHITE"), 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
 #ifndef __WXGTK__
     {
 #if wxUSE_PALETTE
 #ifndef __WXGTK__

diff --git a/src/stc/scintilla/src/KeyWords.cxx b/src/stc/scintilla/src/KeyWords.cxx
index d1eddef5ff814bf16e1fb96cbe9ec8e8ab1f1532..804846e19e908e3d21b41e0ad130ecf37a1b85d7 100644 (file)
--- a/src/stc/scintilla/src/KeyWords.cxx
+++ b/src/stc/scintilla/src/KeyWords.cxx
@@ -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
 #endif
 
 #define LINK_LEXERS
 #endif