Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/bannerwindow.h b/include/wx/bannerwindow.h
index eca396c5b825c3ee7791556fbdb83e39ae7b10a3..1f1fb246111fb74c84a6ff6435d45b5fa91d88b2 100644 (file)
--- a/include/wx/bannerwindow.h
+++ b/include/wx/bannerwindow.h
@@ -3,7 +3,6 @@
 // Purpose:     wxBannerWindow class declaration
 // Author:      Vadim Zeitlin
 // Created:     2011-08-16
 // Purpose:     wxBannerWindow class declaration
 // Author:      Vadim Zeitlin
 // Created:     2011-08-16

-// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -23,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxColour;
 class WXDLLIMPEXP_FWD_CORE wxDC;
 
 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.
 
 // ----------------------------------------------------------------------------
 // A simple banner window showing either a bitmap or text.


@@ -112,6 +111,10 @@ private:
     // configurable in the future.
     wxFont GetTitleFont() const;
 
     // 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;
 
     // The window side along which the banner is laid out.
     wxDirection m_direction;


@@ -119,6 +122,10 @@ private:
     // If valid, this bitmap is drawn as is.
     wxBitmap m_bitmap;
 
     // 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;
     // The title and main message to draw, used if m_bitmap is invalid.
     wxString m_title,
              m_message;