removed Win16 code (patch 905241), last version with remains of Win16 support tagged with BEFORE_WIN16_REMOVAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,9 +28,3 @@
|
||||
|
||||
#include "wx/msw/msvcrt.h"
|
||||
|
||||
// Foils optimizations in Visual C++ (see also app.cpp). Without it,
|
||||
// dummy.obj isn't linked and we get a linker error.
|
||||
#if defined(__VISUALC__) && defined(__WIN16__)
|
||||
char wxDummyChar = 0;
|
||||
#endif
|
||||
|
||||
|
@@ -74,12 +74,6 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const
|
||||
// Make an image list containing small icons
|
||||
p_imageListNormal = new wxImageList(image_size, image_size, TRUE);
|
||||
// should correspond to TreeIc_xxx enum
|
||||
#if defined(__WXMSW__) && defined(__WIN16__)
|
||||
// This is required in 16-bit Windows mode only because we can't load a specific (16x16)
|
||||
// icon image, so it comes out stretched
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE).ConvertToImage().Rescale(image_size, image_size)));
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE).ConvertToImage().Rescale(image_size, image_size)));
|
||||
#else
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(aLogo)).ConvertToImage().Rescale(image_size, image_size)));
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnClosed)).ConvertToImage().Rescale(image_size, image_size)));
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnOpen)).ConvertToImage().Rescale(image_size, image_size)));
|
||||
@@ -87,7 +81,6 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderClosed)).ConvertToImage().Rescale(image_size, image_size)));
|
||||
p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderOpen)).ConvertToImage().Rescale(image_size, image_size)));
|
||||
#endif
|
||||
SetImageList(p_imageListNormal);
|
||||
}
|
||||
|
||||
|
@@ -15,13 +15,6 @@
|
||||
|
||||
#include <wx/config.h>
|
||||
|
||||
#ifdef __WIN16__
|
||||
#include <wx/fileconf.h>
|
||||
|
||||
#undef wxConfig
|
||||
#define wxConfig wxFileConfig
|
||||
#endif
|
||||
|
||||
class ScoreFile {
|
||||
public:
|
||||
ScoreFile(const wxString& appName);
|
||||
|
@@ -9,10 +9,6 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __WIN16__
|
||||
#error "Sorry, Life! will not work in 16-bit Windows"
|
||||
#endif
|
||||
|
||||
// ==========================================================================
|
||||
// headers, declarations, constants
|
||||
// ==========================================================================
|
||||
|
Reference in New Issue
Block a user