X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..e74d06a33b48f4335bf628da028c2a02676a92a6:/include/wx/univ/toplevel.h diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index a02df18726..70f04446c3 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: @@ -155,12 +156,12 @@ protected: void Init(); void RefreshTitleBar(); - void OnNcPaint(wxPaintEvent& event); + void OnNcPaint(wxNcPaintEvent& event); void OnSystemMenu(wxCommandEvent& event); - // TRUE if wxTLW should render decorations (aka titlebar) itself + // true if wxTLW should render decorations (aka titlebar) itself static int ms_drawDecorations; - // TRUE if wxTLW can be iconized + // true if wxTLW can be iconized static int ms_canIconize; // true for currently active frame bool m_isActive:1;