Add missing wxUSE_OLE checks to safearray.cpp.

[wxWidgets.git] / include / wx / bannerwindow.h

diff --git a/include/wx/bannerwindow.h b/include/wx/bannerwindow.h
index eca396c5b825c3ee7791556fbdb83e39ae7b10a3..80c8eb9bc941bc98c269ba1965022b4dbe56956c 100644 (file)
--- a/include/wx/bannerwindow.h
+++ b/include/wx/bannerwindow.h
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxColour;
 class WXDLLIMPEXP_FWD_CORE wxDC;
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxBannerWindowNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const char) wxBannerWindowNameStr[];
 
 // ----------------------------------------------------------------------------
 // A simple banner window showing either a bitmap or text.
@@ -112,6 +112,10 @@ private:
     // configurable in the future.
     wxFont GetTitleFont() const;
 
+    // Return the colour to use for extending the bitmap. Non-const as it
+    // updates m_colBitmapBg if needed.
+    wxColour GetBitmapBg();
+
 
     // The window side along which the banner is laid out.
     wxDirection m_direction;
@@ -119,6 +123,10 @@ private:
     // If valid, this bitmap is drawn as is.
     wxBitmap m_bitmap;
 
+    // If bitmap is valid, this is the colour we use to extend it if the bitmap
+    // is smaller than this window. It is computed on demand by GetBitmapBg().
+    wxColour m_colBitmapBg;
+
     // The title and main message to draw, used if m_bitmap is invalid.
     wxString m_title,
              m_message;