provide stubs for conversion to/from image functions even when wxUSE_WXDIB==0, this allows to not test for it in other places

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

include/wx/msw/bitmap.h

@@ -64,7 +64,7 @@ public:
     // Create a bitmap compatible with the given DC
     wxBitmap(int width, int height, const wxDC& dc);
 
-#if wxUSE_IMAGE && wxUSE_WXDIB
+#if wxUSE_IMAGE
     // Convert from wxImage
     wxBitmap(const wxImage& image, int depth = -1)
         { (void)CreateFromImage(image, depth); }
@@ -94,7 +94,7 @@ public:
 
     virtual ~wxBitmap();
 
-#if wxUSE_IMAGE && wxUSE_WXDIB
+#if wxUSE_IMAGE
     wxImage ConvertToImage() const;
 #endif // wxUSE_IMAGE
 
@@ -171,7 +171,7 @@ protected:
     // creates an uninitialized bitmap, called from Create()s above
     bool DoCreate(int w, int h, int depth, WXHDC hdc);
 
-#if wxUSE_IMAGE && wxUSE_WXDIB
+#if wxUSE_IMAGE
     // creates the bitmap from wxImage, supposed to be called from ctor
     bool CreateFromImage(const wxImage& image, int depth);
 
@@ -183,10 +183,9 @@ protected:
 #endif // wxUSE_IMAGE
 
 private:
-#ifdef __WIN32__
     // common part of CopyFromIcon/CopyFromCursor for Win32
     bool CopyFromIconOrCursor(const wxGDIImage& icon);
-#endif // __WIN32__
+
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };

src/msw/bitmap.cpp

@@ -780,8 +780,6 @@ wxImage wxBitmap::ConvertToImage() const
 // wxImage to/from conversions
 // ----------------------------------------------------------------------------
 
-#if wxUSE_WXDIB
-
 bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     return CreateFromImage(image, depth, 0);
@@ -795,6 +793,8 @@ bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
     return CreateFromImage(image, -1, dc.GetHDC());
 }
 
+#if wxUSE_WXDIB
+
 bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
 {
     wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
@@ -974,7 +974,22 @@ wxImage wxBitmap::ConvertToImage() const
     return image;
 }
 
-#endif // wxUSE_WXDIB
+#else // !wxUSE_WXDIB
+
+bool
+wxBitmap::CreateFromImage(const wxImage& WXUNUSED(image),
+                          int WXUNUSED(depth),
+                          WXHDC WXUNUSED(hdc))
+{
+    return false;
+}
+
+wxImage wxBitmap::ConvertToImage() const
+{
+    return wxImage();
+}
+
+#endif // wxUSE_WXDIB/!wxUSE_WXDIB
 
 #endif // wxUSE_IMAGE