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

Fixed some bit-rot problems in contribs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-07 22:58:16 +00:00
parent 968602f890
commit 12d1ab44bb
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/animate/animate.cpp
View File

@@ -116,7 +116,7 @@ bool wxAnimationPlayer::Build()
if (GetTransparentColour(transparentColour)) if (GetTransparentColour(transparentColour))
image->SetMaskColour(transparentColour.Red(), transparentColour.Green(), transparentColour.Blue()); image->SetMaskColour(transparentColour.Red(), transparentColour.Green(), transparentColour.Blue());
bitmap = new wxBitmap(image->ConvertToBitmap()); bitmap = new wxBitmap(* image);
delete image; delete image;
if (bitmap) if (bitmap)
m_frames.Append(bitmap); m_frames.Append(bitmap);

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

@@ -1428,7 +1428,7 @@ void wxCanvasImage::Render(wxTransformMatrix* cworld, int clip_x, int clip_y, in
if (cworld->GetRotation()) if (cworld->GetRotation())
tmp = tmp.Rotate(-cworld->GetRotation()/180.0 * pi, centr, TRUE, NULL ); tmp = tmp.Rotate(-cworld->GetRotation()/180.0 * pi, centr, TRUE, NULL );
bmp = tmp.ConvertToBitmap(); bmp = wxBitmap(tmp);
// create cached bitmap // create cached bitmap
m_cBitmap = bmp; 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 ); wxRect sub_rect( clip_x, clip_y, clip_width, clip_height );
wxBitmap sub_bitmap( bitmap->GetSubBitmap( sub_rect ) ); wxBitmap sub_bitmap( bitmap->GetSubBitmap( sub_rect ) );
wxImage image( sub_bitmap ); wxImage image( sub_bitmap.ConvertToImage() );
// local coordinates // local coordinates
int start_x = clip_x - tmparea.x; 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(); wxDC *dc = m_admin->GetActive()->GetDC();
dc->DrawBitmap( sub_bitmap, clip_x, clip_y ); dc->DrawBitmap( sub_bitmap, clip_x, clip_y );

4
contrib/src/mmedia/MmediaVC.dsp
View File

@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# 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 "../../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 BASE RSC /l 0x809
# ADD RSC /l 0x809 # ADD RSC /l 0x809
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # 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 BASE RSC /l 0x809
# ADD RSC /l 0x809 # ADD RSC /l 0x809
BSC32=bscmake.exe BSC32=bscmake.exe

12
distrib/msw/generic.rsp
View File

@@ -684,6 +684,18 @@ samples/ipc/*.ico
samples/ipc/*.txt samples/ipc/*.txt
samples/ipc/*.pro 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/*.cpp
samples/layout/*.h samples/layout/*.h
samples/layout/*.def samples/layout/*.def

3
distrib/msw/vc.rsp
View File

@@ -111,6 +111,9 @@ samples/image/image.dsw
samples/internat/internat.dsp samples/internat/internat.dsp
samples/internat/internat.dsw samples/internat/internat.dsw
samples/keyboard/keyboard.dsp
samples/keyboard/keyboard.dsw
samples/ipc/client.dsp samples/ipc/client.dsp
samples/ipc/client.dsw samples/ipc/client.dsw
samples/ipc/server.dsp samples/ipc/server.dsp