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

removed 2.0 compatibility stuff (patch 1054261)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-11 18:59:51 +00:00
parent 16ca2e0fac
commit 81152407d0
13 changed files with 7 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/mac/setup0.h
View File

@@ -44,27 +44,6 @@
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
// In wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
// but this is very dangerous because you can mistakenly pass an icon instead
// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
// because an icon is not a valid bitmap
//
// Starting from 2.1.12, you have the choice under this backwards compatible
// behaviour (your code will still compile, but probably won't behave as
// expected!) and not deriving wxIcon class from wxBitmap, but providing a
// conversion ctor wxBitmap(const wxIcon&) instead.
//
// Recommended setting: 0
#define wxICON_IS_BITMAP 0
// Define as 1 for font size to be backward compatible to 1.63 and earlier.
// 1.64 and later define point sizes to be compatible with Windows.
//
// Default is 0
//
// Recommended setting: 0
#define wxFONT_SIZE_COMPATIBILITY 0
// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
// If migrating between versions, your dialogs may seem to shrink.
//

8
include/wx/msw/setup0.h
View File

@@ -44,14 +44,6 @@
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
// Define as 1 for font size to be backward compatible to 1.63 and earlier.
// 1.64 and later define point sizes to be compatible with Windows.
//
// Default is 0
//
// Recommended setting: 0
#define wxFONT_SIZE_COMPATIBILITY 0
// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
// If migrating between versions, your dialogs may seem to shrink.
//

23
include/wx/msw/setup_microwin.h
View File

@@ -28,7 +28,7 @@
// compatibility settings
// ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.0 API: set it to 1 to
// This setting determines the compatibility with 2.2 API: set it to 1 to
// enable it
//
// Default is 1.
@@ -36,27 +36,6 @@
// Recommended setting: 0 (please update your code instead!)
#define WXWIN_COMPATIBILITY_2_2 1
// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
// but this is very dangerous because you can mistakenly pass an icon instead
// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
// because an icon is not a valid bitmap
//
// Starting from 2.1.12, you have the choice under this backwards compatible
// behaviour (your code will still compile, but probably won't behave as
// expected!) and not deriving wxIcon class from wxBitmap, but providing a
// conversion ctor wxBitmap(const wxIcon&) instead.
//
// Recommended setting: 0
#define wxICON_IS_BITMAP 0
// Define as 1 for font size to be backward compatible to 1.63 and earlier.
// 1.64 and later define point sizes to be compatible with Windows.
//
// Default is 0
//
// Recommended setting: 0
#define wxFONT_SIZE_COMPATIBILITY 0
// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
// If migrating between versions, your dialogs may seem to shrink.
//

8
include/wx/msw/wince/setup.h
View File

@@ -44,14 +44,6 @@
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
// Define as 1 for font size to be backward compatible to 1.63 and earlier.
// 1.64 and later define point sizes to be compatible with Windows.
//
// Default is 0
//
// Recommended setting: 0
#define wxFONT_SIZE_COMPATIBILITY 0
// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
// If migrating between versions, your dialogs may seem to shrink.
//

18
include/wx/os2/icon.h
View File

@@ -16,23 +16,11 @@
// headers
// ----------------------------------------------------------------------------
// compatible (even if incorrect) behaviour by default: derive wxIcon from
// wxBitmap
#ifndef wxICON_IS_BITMAP
#define wxICON_IS_BITMAP 1
#endif
#include "wx/bitmap.h"
#if wxICON_IS_BITMAP
#include "wx/os2/gdiimage.h"
#define wxIconRefDataBase wxBitmapRefData
#define wxIconBase wxBitmap
#else
#include "wx/os2/gdiimage.h"
#define wxIconRefDataBase wxGDIImageRefData
#define wxIconBase wxGDIImage
#endif
#define wxIconRefDataBase wxGDIImageRefData
#define wxIconBase wxGDIImage
class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
{

3
include/wx/os2/setup0.h
View File

@@ -18,9 +18,6 @@
#define wxUSE_EXCEPTIONS 1
// define this to 1 if you want icons to behave as bitmaps
#define wxICON_IS_BITMAP 0
// define this to 0 when building wxBase library
#define wxUSE_GUI 1

8
include/wx/palmos/setup0.h
View File

@@ -44,14 +44,6 @@
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
// Define as 1 for font size to be backward compatible to 1.63 and earlier.
// 1.64 and later define point sizes to be compatible with Windows.
//
// Default is 0
//
// Recommended setting: 0
#define wxFONT_SIZE_COMPATIBILITY 0
// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
// If migrating between versions, your dialogs may seem to shrink.
//

11
include/wx/univ/setup0.h
View File

@@ -44,14 +44,6 @@
// Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1
// Define as 1 for font size to be backward compatible to 1.63 and earlier.
// 1.64 and later define point sizes to be compatible with Windows.
//
// Default is 0
//
// Recommended setting: 0
#define wxFONT_SIZE_COMPATIBILITY 0
// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
// If migrating between versions, your dialogs may seem to shrink.
//
@@ -868,10 +860,11 @@
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
// Set to 0 to disable MDI document/view architecture
//
// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
#define wxUSE_MDI_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
//
#define wxUSE_PRINTING_ARCHITECTURE 1
// wxHTML sublibrary allows to display HTML in wxWindow programs and much,