Missing wxUSE_PALETTE markup (#1369489).

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index d33ce22cc1410b7395e6b37b007037fb7faff1f6..0e74b7a631e1ea3ef8aa2a4ef70988d049bb80fd 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.h
+// Name:        wx/gtk/bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -40,19 +40,23 @@ class WXDLLIMPEXP_CORE wxMask: public wxObject
 public:
     wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
+#if wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
-  
+
     bool Create( const wxBitmap& bitmap, const wxColour& colour );
+#if wxUSE_PALETTE
     bool Create( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE
     bool Create( const wxBitmap& bitmap );
 
     // implementation
     GdkBitmap   *m_bitmap;
-    
+
     GdkBitmap *GetBitmap() const;
-  
+
 private:
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
@@ -79,11 +83,11 @@ public:
     bool Ok() const;
 
     bool Create(int width, int height, int depth = -1);
-    
+
     int GetHeight() const;
     int GetWidth() const;
     int GetDepth() const;
-    
+
     wxImage ConvertToImage() const;
 
     // copies the contents and mask of the given (colour) icon to the bitmap
@@ -91,7 +95,7 @@ public:
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
-    
+
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     bool SaveFile(const wxString &name, wxBitmapType type,
@@ -125,10 +129,10 @@ public:
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
 #endif
-    
+
     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
-    
+
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
@@ -161,7 +165,7 @@ private:
 #endif
     friend class wxBitmapHandler;
 
-private:    
+private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index b1f5d1a8baf7d462a2690cc073ecd86bc5b5b49a..daf2bdc1ecbbd0adb59c935492d6982bb34eb716 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.h
+// Name:        wx/gtk/dc.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -41,7 +41,9 @@ public:
     wxDC();
     ~wxDC() { }
 
+#if wxUSE_PALETTE
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
+#endif // wxUSE_PALETTE
 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index d33ce22cc1410b7395e6b37b007037fb7faff1f6..0e74b7a631e1ea3ef8aa2a4ef70988d049bb80fd 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.h
+// Name:        wx/gtk/bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -40,19 +40,23 @@ class WXDLLIMPEXP_CORE wxMask: public wxObject
 public:
     wxMask();
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
+#if wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
-  
+
     bool Create( const wxBitmap& bitmap, const wxColour& colour );
+#if wxUSE_PALETTE
     bool Create( const wxBitmap& bitmap, int paletteIndex );
+#endif // wxUSE_PALETTE
     bool Create( const wxBitmap& bitmap );
 
     // implementation
     GdkBitmap   *m_bitmap;
-    
+
     GdkBitmap *GetBitmap() const;
-  
+
 private:
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
@@ -79,11 +83,11 @@ public:
     bool Ok() const;
 
     bool Create(int width, int height, int depth = -1);
-    
+
     int GetHeight() const;
     int GetWidth() const;
     int GetDepth() const;
-    
+
     wxImage ConvertToImage() const;
 
     // copies the contents and mask of the given (colour) icon to the bitmap
@@ -91,7 +95,7 @@ public:
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
-    
+
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     bool SaveFile(const wxString &name, wxBitmapType type,
@@ -125,10 +129,10 @@ public:
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
 #endif
-    
+
     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
-    
+
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
@@ -161,7 +165,7 @@ private:
 #endif
     friend class wxBitmapHandler;
 
-private:    
+private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index b1f5d1a8baf7d462a2690cc073ecd86bc5b5b49a..daf2bdc1ecbbd0adb59c935492d6982bb34eb716 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dc.h
+// Name:        wx/gtk/dc.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -41,7 +41,9 @@ public:
     wxDC();
     ~wxDC() { }
 
+#if wxUSE_PALETTE
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
+#endif // wxUSE_PALETTE
 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 1a4c20bb62f8ae4d207e0db3b9b5c405d545387b..46ffd4b0ca898f3fc39ebd7a26d3a29e560d3ae1 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/gtk/bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -71,11 +71,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
     Create( bitmap, colour );
 }
 
+#if wxUSE_PALETTE
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }
+#endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
@@ -182,6 +184,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     return true;
 }
 
+#if wxUSE_PALETTE
 bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 {
     unsigned char r,g,b;
@@ -193,6 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 
     return Create(bitmap, wxColour(r, g, b));
 }
+#endif // wxUSE_PALETTE
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
@@ -271,7 +275,9 @@ wxBitmapRefData::~wxBitmapRefData()
         gdk_pixbuf_unref( m_pixbuf );
 #endif
     delete m_mask;
+#if wxUSE_PALETTE
     delete m_palette;
+#endif // wxUSE_PALETTE
 }
 
 //-----------------------------------------------------------------------------
@@ -1388,6 +1394,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
     return true;
 }
 
+#if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
     if (!Ok())
@@ -1400,6 +1407,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
 {
     // TODO
 }
+#endif // wxUSE_PALETTE
 
 void wxBitmap::SetHeight( int height )
 {
@@ -1658,5 +1666,3 @@ bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
 {
     // TODO: Insert handler based on GdkPixbufs handler later
 }
-
-

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 1a4c20bb62f8ae4d207e0db3b9b5c405d545387b..46ffd4b0ca898f3fc39ebd7a26d3a29e560d3ae1 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/gtk/bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -71,11 +71,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
     Create( bitmap, colour );
 }
 
+#if wxUSE_PALETTE
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }
+#endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
@@ -182,6 +184,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     return true;
 }
 
+#if wxUSE_PALETTE
 bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 {
     unsigned char r,g,b;
@@ -193,6 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 
     return Create(bitmap, wxColour(r, g, b));
 }
+#endif // wxUSE_PALETTE
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
@@ -271,7 +275,9 @@ wxBitmapRefData::~wxBitmapRefData()
         gdk_pixbuf_unref( m_pixbuf );
 #endif
     delete m_mask;
+#if wxUSE_PALETTE
     delete m_palette;
+#endif // wxUSE_PALETTE
 }
 
 //-----------------------------------------------------------------------------
@@ -1388,6 +1394,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
     return true;
 }
 
+#if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
     if (!Ok())
@@ -1400,6 +1407,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
 {
     // TODO
 }
+#endif // wxUSE_PALETTE
 
 void wxBitmap::SetHeight( int height )
 {
@@ -1658,5 +1666,3 @@ bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
 {
     // TODO: Insert handler based on GdkPixbufs handler later
 }
-
-