Fixed some bit-rot problems in contribs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/animate/animate.cpp b/contrib/src/animate/animate.cpp
index 6a17313299afc558784c355ac3aa234453d73f16..a0bad64e6eed94903d7a22fcd4fe916dae29a768 100644 (file)
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -116,7 +116,7 @@ bool wxAnimationPlayer::Build()
                 if (GetTransparentColour(transparentColour))
                     image->SetMaskColour(transparentColour.Red(), transparentColour.Green(), transparentColour.Blue());
 
-                bitmap = new wxBitmap(image->ConvertToBitmap());
+                bitmap = new wxBitmap(* image);
                 delete image;
                 if (bitmap)
                     m_frames.Append(bitmap);

diff --git a/contrib/src/canvas/canvas.cpp b/contrib/src/canvas/canvas.cpp
index 7a63dc03529c7e47fa479acb7a75afb2a18e444c..3853269f960b3c96d389297266955a5258de308e 100644 (file)
--- a/contrib/src/canvas/canvas.cpp
+++ b/contrib/src/canvas/canvas.cpp
@@ -1428,7 +1428,7 @@ void wxCanvasImage::Render(wxTransformMatrix* cworld, int clip_x, int clip_y, in
         if (cworld->GetRotation())
             tmp = tmp.Rotate(-cworld->GetRotation()/180.0 * pi, centr, TRUE, NULL );
             
-        bmp = tmp.ConvertToBitmap();
+        bmp = wxBitmap(tmp);
         
         // create cached bitmap
         m_cBitmap = bmp;
@@ -1658,7 +1658,7 @@ void wxCanvasText::Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int
     wxRect sub_rect( clip_x, clip_y, clip_width, clip_height );
     wxBitmap sub_bitmap( bitmap->GetSubBitmap( sub_rect ) );
 
-    wxImage image( sub_bitmap );
+    wxImage image( sub_bitmap.ConvertToImage() );
 
     // local coordinates
     int start_x = clip_x - tmparea.x;
@@ -1695,7 +1695,7 @@ void wxCanvasText::Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int
             }
         }
 
-   sub_bitmap = image.ConvertToBitmap();
+   sub_bitmap = wxBitmap(image);
 
    wxDC *dc = m_admin->GetActive()->GetDC();
    dc->DrawBitmap( sub_bitmap, clip_x, clip_y );

diff --git a/contrib/src/mmedia/MmediaVC.dsp b/contrib/src/mmedia/MmediaVC.dsp
index a37371691e06b1f3149a2524cdeacc30ab10e2d6..6aa528a2d15605e3f0751ec0e43b71655c9008b3 100644 (file)
--- a/contrib/src/mmedia/MmediaVC.dsp
+++ b/contrib/src/mmedia/MmediaVC.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # 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 "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../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" /YX /FD /c
 # ADD BASE RSC /l 0x809
 # ADD RSC /l 0x809
 BSC32=bscmake.exe

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index f505d97ddc8c34ba3502ffb9ad4a5e5e4238ef34..f53687cfaa6197971808dfa29301b910754081cc 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -684,6 +684,18 @@ samples/ipc/*.ico
 samples/ipc/*.txt
 samples/ipc/*.pro
 
+samples/keyboard/*.cpp
+samples/keyboard/*.h
+samples/keyboard/*.def
+samples/keyboard/*.rc
+samples/keyboard/*.txt
+samples/keyboard/makefile*
+samples/keyboard/*.xbm
+samples/keyboard/*.xpm
+samples/keyboard/*.ico
+samples/keyboard/*.bmp
+samples/keyboard/*.pro
+
 samples/layout/*.cpp
 samples/layout/*.h
 samples/layout/*.def

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index c4f9642b19c8f50514078707c4887ad1c1967f2f..9c0b683abc1197be27497dd95fb819f469d845c9 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -111,6 +111,9 @@ samples/image/image.dsw
 samples/internat/internat.dsp
 samples/internat/internat.dsw
 
+samples/keyboard/keyboard.dsp
+samples/keyboard/keyboard.dsw
+
 samples/ipc/client.dsp
 samples/ipc/client.dsw
 samples/ipc/server.dsp