Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix several mingw32 warnings (patch from Tim Stahlhut)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-02 11:36:35 +00:00
parent b152d8c56c
commit f5851311d3
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/richtext/richtextsymboldlg.h
View File

@@ -28,7 +28,7 @@
////@begin forward declarations ////@begin forward declarations
class wxSymbolListCtrl; class wxSymbolListCtrl;
class WXDLLIMPEXP_CORE wxTextCtrl; class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
////@end forward declarations ////@end forward declarations

9
include/wx/vector.h
View File

@@ -59,9 +59,12 @@ public:
// increase the size twice, unless we're already too big or unless // increase the size twice, unless we're already too big or unless
// more is requested // more is requested
const size_type increment = (m_size > 0) //
? wxMin(m_size, ALLOC_MAX_SIZE) // NB: casts to size_t are needed to suppress mingw32 warnings about
: ALLOC_INITIAL_SIZE; // mixing enums and ints in the same expression
const size_type increment = m_size > 0
? wxMin(m_size, (size_type)ALLOC_MAX_SIZE)
: (size_type)ALLOC_INITIAL_SIZE;
if ( m_capacity + increment > n ) if ( m_capacity + increment > n )
n = m_capacity + increment; n = m_capacity + increment;

4
src/common/wxcrt.cpp
View File

@@ -936,9 +936,9 @@ wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
unsigned int n; unsigned int n;
T c = *i; T c = *i;
if ( c >= wxT('0') ) if ( c >= '0' )
{ {
if ( c <= wxT('9') ) if ( c <= '9' )
n = c - wxT('0'); n = c - wxT('0');
else else
n = wxTolower(c) - wxT('a') + 10; n = wxTolower(c) - wxT('a') + 10;

2
src/msw/accel.cpp
View File

@@ -44,7 +44,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
{ {
friend class WXDLLEXPORT wxAcceleratorTable; friend class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
public: public:
wxAcceleratorRefData(); wxAcceleratorRefData();
virtual ~wxAcceleratorRefData(); virtual ~wxAcceleratorRefData();

2
src/msw/checklst.cpp
View File

@@ -124,7 +124,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
class wxCheckListBoxItem : public wxOwnerDrawn class wxCheckListBoxItem : public wxOwnerDrawn
{ {
friend class WXDLLEXPORT wxCheckListBox; friend class WXDLLIMPEXP_FWD_CORE wxCheckListBox;
public: public:
// ctor // ctor
wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex); wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);