X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71cb2ca1e324624806cfb2cc999cfcd313a10e14..8ccff7d2116057a0e79db28491a6c7fdf4051a58:/include/wx/univ/toplevel.h diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 1c4811f37b..9790eb6ca9 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -11,12 +11,13 @@ #ifndef __WX_UNIV_TOPLEVEL_H__ #define __WX_UNIV_TOPLEVEL_H__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univtoplevel.h" #endif #include "wx/univ/inpcons.h" #include "wx/univ/inphand.h" +#include "wx/icon.h" // ---------------------------------------------------------------------------- // constants @@ -35,7 +36,7 @@ enum wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000, wxTOPLEVEL_BUTTON_ICONIZE = 0x04000000, wxTOPLEVEL_BUTTON_RESTORE = 0x08000000, - wxTOPLEVEL_BUTTON_HELP = 0x10000000, + wxTOPLEVEL_BUTTON_HELP = 0x10000000 }; // frame hit test return values: @@ -123,7 +124,8 @@ public: virtual wxPoint GetClientAreaOrigin() const; virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetClientSize(int width, int height); - virtual void SetIcon(const wxIcon& icon); + virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); } + virtual void SetIcons(const wxIconBundle& icons); // implementation from now on // -------------------------- @@ -141,6 +143,8 @@ public: virtual int GetMinWidth() const; virtual int GetMinHeight() const; + virtual bool ProvidesBackground() const { return TRUE; } + protected: // handle titlebar button click event virtual void ClickTitleBarButton(long button);