warnings (and some errors) fixes for wxUniv DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -141,8 +141,8 @@ private:
|
||||
static wxHelpProvider *ms_helpProvider;
|
||||
};
|
||||
|
||||
WX_DECLARE_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
|
||||
wxLongToStringHashMap );
|
||||
WX_DECLARE_EXPORTED_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
|
||||
wxLongToStringHashMap );
|
||||
|
||||
// wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
|
||||
// only plain text help strings and shows the string associated with the
|
||||
|
@@ -175,8 +175,8 @@ public:
|
||||
#endif
|
||||
|
||||
// no icon
|
||||
void SetIcon( const wxIcon &icon ) { /*m_icons = wxIconBundle( icon );*/}
|
||||
void SetIcons( const wxIconBundle &icons ) { /*m_icons = icons;*/ }
|
||||
void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
|
||||
void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
|
||||
|
||||
// no maximize etc
|
||||
virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ }
|
||||
|
@@ -277,7 +277,7 @@ public:
|
||||
virtual int GetSelection() const;
|
||||
void SetSelection(int n) { Select(n); }
|
||||
|
||||
void SetStringSelection(const wxString& s) { }
|
||||
void SetStringSelection(const wxString& WXUNUSED(s)) { }
|
||||
|
||||
// we have to redefine these functions here to avoid ambiguities in classes
|
||||
// deriving from us which would arise otherwise because we inherit these
|
||||
|
@@ -24,7 +24,7 @@
|
||||
|
||||
// fwd declarations
|
||||
class WXDLLEXPORT wxMenuInfo;
|
||||
WX_DECLARE_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
|
||||
WX_DECLARE_EXPORTED_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
|
||||
|
||||
class WXDLLEXPORT wxMenuGeometryInfo;
|
||||
class WXDLLEXPORT wxPopupMenuWindow;
|
||||
|
@@ -21,7 +21,7 @@ class WXDLLEXPORT wxRadioButton;
|
||||
#include "wx/statbox.h"
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
WX_DEFINE_ARRAY(wxRadioButton *, wxArrayRadioButtons);
|
||||
WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxRadioButton *, wxArrayRadioButtons);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRadioBox: a box full of radio buttons
|
||||
|
@@ -671,7 +671,7 @@ public:
|
||||
wxOrientation orient,
|
||||
int start,
|
||||
int end,
|
||||
int step = 1,
|
||||
int WXUNUSED(step) = 1,
|
||||
int flags = 0,
|
||||
long style = 0)
|
||||
{ m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient,
|
||||
|
Reference in New Issue
Block a user