From e227438f246005b50319189a28d0128bb83ab3bf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Nov 2008 13:13:27 +0000 Subject: [PATCH] change Has/SetFlag() to take int instead of unsigned as the latter provokes VC7 warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/framemanager.h | 4 ++-- interface/wx/aui/framemanager.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index 87bc77ab66..00de34da6a 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -331,7 +331,7 @@ public: return *this; } - wxAuiPaneInfo& SetFlag(unsigned int flag, bool option_state) + wxAuiPaneInfo& SetFlag(int flag, bool option_state) { if (option_state) state |= flag; @@ -340,7 +340,7 @@ public: return *this; } - bool HasFlag(unsigned int flag) const + bool HasFlag(int flag) const { return (state & flag) != 0; } diff --git a/interface/wx/aui/framemanager.h b/interface/wx/aui/framemanager.h index 6e6d5ad581..2ad6b9471f 100644 --- a/interface/wx/aui/framemanager.h +++ b/interface/wx/aui/framemanager.h @@ -284,7 +284,7 @@ public: This method is used to specify wxAuiManager's settings flags. @a flags specifies options which allow the frame management behavior to be modified. */ - void SetFlags(unsigned int flags); + void SetFlags(int flags); /** Called to specify the frame or window which is to be managed by wxAuiManager. @@ -516,10 +516,10 @@ public: bool HasCloseButton() const; /** - HasFlag() returns @true if the the property specified by flag is active for the - pane. + HasFlag() returns @true if the property specified by flag is active for + the pane. */ - bool HasFlag(unsigned int flag) const; + bool HasFlag(int flag) const; /** HasGripper() returns @true if the pane displays a gripper. -- 2.45.2