X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/193e19cfdfc0506d9ddc19b3532d340fd7421bae..c845a1975a3d6d79b19a7ec77bd8e0b8b8850751:/include/wx/univ/toplevel.h diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 9edcf899f6..e0fb181d12 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -11,7 +11,7 @@ #ifndef __WX_UNIV_TOPLEVEL_H__ #define __WX_UNIV_TOPLEVEL_H__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univtoplevel.h" #endif @@ -36,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: @@ -143,7 +143,7 @@ public: virtual int GetMinWidth() const; virtual int GetMinHeight() const; - virtual bool ProvidesBackground() { return TRUE; } + virtual bool ProvidesBackground() const { return true; } protected: // handle titlebar button click event @@ -158,12 +158,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;