Disable creation of wxDIB from wxBitmap in non-wxMSW ports.

wxDIB can now be used with wxGTK under Windows, i.e. when not using wxMSW
version of wxBitmap but it can't be created from wxBitmap then as it doesn't
have a corresponding HBITMAP.

Simply disable this functionality when not using wxMSW.

Closes #14414.

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

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index 58061449f1222eae24ecdc92264b415bc52cc095..9ae349ba192ce18cc633f1a34c2823e7edd28f07 100644 (file)
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -37,9 +37,11 @@ public:
     wxDIB(int width, int height, int depth)
         { Init(); (void)Create(width, height, depth); }
 
     wxDIB(int width, int height, int depth)
         { Init(); (void)Create(width, height, depth); }
 

+#ifdef __WXMSW__

     // create a DIB from the DDB
     wxDIB(const wxBitmap& bmp)
         { Init(); (void)Create(bmp); }
     // create a DIB from the DDB
     wxDIB(const wxBitmap& bmp)
         { Init(); (void)Create(bmp); }

+#endif // __WXMSW__

 
     // create a DIB from the Windows DDB
     wxDIB(HBITMAP hbmp)
 
     // create a DIB from the Windows DDB
     wxDIB(HBITMAP hbmp)


@@ -53,7 +55,9 @@ public:
 
     // same as the corresponding ctors but with return value
     bool Create(int width, int height, int depth);
 
     // same as the corresponding ctors but with return value
     bool Create(int width, int height, int depth);

+#ifdef __WXMSW__

     bool Create(const wxBitmap& bmp) { return Create(GetHbitmapOf(bmp)); }
     bool Create(const wxBitmap& bmp) { return Create(GetHbitmapOf(bmp)); }

+#endif

     bool Create(HBITMAP hbmp);
     bool Load(const wxString& filename);
 
     bool Create(HBITMAP hbmp);
     bool Load(const wxString& filename);
 

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index 00faac6a4eaf023b6f3226185f2fb27e4146f3cb..b12baf0f83fe751c48a6f6b05b854663a9b81ef8 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -575,7 +575,7 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 wxPalette *wxDIB::CreatePalette() const
 {
     // GetDIBColorTable not available in eVC3
 wxPalette *wxDIB::CreatePalette() const
 {
     // GetDIBColorTable not available in eVC3

-#if defined(_WIN32_WCE) && _WIN32_WCE < 400
+#if !defined(__WXMSW__) || defined(_WIN32_WCE) && _WIN32_WCE < 400

     return NULL;
 #else
     wxCHECK_MSG( m_handle, NULL, wxT("wxDIB::CreatePalette(): invalid object") );
     return NULL;
 #else
     wxCHECK_MSG( m_handle, NULL, wxT("wxDIB::CreatePalette(): invalid object") );