add wxUSE_IMAGE to setup.h and GetHFONT to wxFont.

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index bdbe4002c410ccecc45029a59048b7a04ca4806a..fc8c8e55560eb7f1915173d7d7be4773759933fe 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -107,6 +107,7 @@ public:
     virtual WXHANDLE GetResourceHandle(void);
     virtual bool     FreeResource(bool bForce = FALSE);
 
+    WXHFONT GetHFONT(void) const;
 protected:
     //
     // Common part of all ctors

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index 11d78ac504cf1fe2b4d6fb7a9372d1b05163fb31..83aa19c65041e0ae351a82499a1cbf312c3d106c 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -15,12 +15,6 @@
 // ----------------------------------------------------------------------------
 // global settings
 // ----------------------------------------------------------------------------
-// use TCPV40 from toolkit - EK
-#define TCPV40HDRS
-
-// use double mode + PM GUI and Window text window,
-// to use it you must link your app as "Window"
-#define wxUSE_CONSOLEDEBUG   1
 
 // define this to 1 if you want icons to behave as bitmaps
 #define wxICON_IS_BITMAP     0
@@ -34,12 +28,6 @@
 
 #define wxUSE_FILESYSTEM       1 // better have this is you want to compile wxHTML
 
-#define wxUSE_PCX              1 // Utilize PCX images
-
-#define wxUSE_PNM              1 // Utilize PNM images
-
-#define wxUSE_GIF              1 // Utilize GIF images
-
 #if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
 #define wxUSE_LONGLONG        1
 #endif
@@ -219,10 +207,23 @@
                                   // and make the library thread safe
 #define wxUSE_ZLIB          1
                                   // Use zlib for compression in streams and PNG code
+#define wxUSE_IMAGE         1
+                                  // Set to 1 for wxImage support (recommended).
 #define wxUSE_LIBPNG        1
-                                  // Use PNG bitmap code
+                                  // Set to 1 for PNG format support
 #define wxUSE_LIBJPEG       1
-                                  // Use JPEG bitmap code
+                                  // Set to 1 for JPEG format support
+#define wxUSE_LIBTIFF       1
+                                  // Set to 1 for TIFF format support
+#define wxUSE_GIF           1
+                                  // Set to 1 for GIF format support
+#define wxUSE_PNM           1
+                                  // Set to 1 for PNM format support
+#define wxUSE_PCX           1
+                                  // Set to 1 for PCX format support
+#define wxUSE_XPM           1
+                                  // Set to 1 for XPM format support
+
 #define wxUSE_SERIAL        1
                                   // Use serialization (requires utils/serialize)
 #define wxUSE_DYNLIB_CLASS  1

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 3880f8fce704e7ab2725956f4cc4dca5667009a7..83aa19c65041e0ae351a82499a1cbf312c3d106c 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -28,12 +28,6 @@
 
 #define wxUSE_FILESYSTEM       1 // better have this is you want to compile wxHTML
 
-#define wxUSE_PCX              1 // Utilize PCX images
-
-#define wxUSE_PNM              1 // Utilize PNM images
-
-#define wxUSE_GIF              1 // Utilize GIF images
-
 #if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
 #define wxUSE_LONGLONG        1
 #endif
@@ -213,10 +207,23 @@
                                   // and make the library thread safe
 #define wxUSE_ZLIB          1
                                   // Use zlib for compression in streams and PNG code
+#define wxUSE_IMAGE         1
+                                  // Set to 1 for wxImage support (recommended).
 #define wxUSE_LIBPNG        1
-                                  // Use PNG bitmap code
+                                  // Set to 1 for PNG format support
 #define wxUSE_LIBJPEG       1
-                                  // Use JPEG bitmap code
+                                  // Set to 1 for JPEG format support
+#define wxUSE_LIBTIFF       1
+                                  // Set to 1 for TIFF format support
+#define wxUSE_GIF           1
+                                  // Set to 1 for GIF format support
+#define wxUSE_PNM           1
+                                  // Set to 1 for PNM format support
+#define wxUSE_PCX           1
+                                  // Set to 1 for PCX format support
+#define wxUSE_XPM           1
+                                  // Set to 1 for XPM format support
+
 #define wxUSE_SERIAL        1
                                   // Use serialization (requires utils/serialize)
 #define wxUSE_DYNLIB_CLASS  1