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

warnings (and some errors) fixes for wxUniv DLL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-03 20:58:56 +00:00
parent 05e3a383e0
commit 61fef19b85
27 changed files with 168 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/cshelp.h
View File

@@ -141,8 +141,8 @@ private:
static wxHelpProvider *ms_helpProvider; static wxHelpProvider *ms_helpProvider;
}; };
WX_DECLARE_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual, WX_DECLARE_EXPORTED_HASH_MAP( long, wxString, wxIntegerHash, wxIntegerEqual,
wxLongToStringHashMap ); wxLongToStringHashMap );
// wxSimpleHelpProvider is an implementation of wxHelpProvider which supports // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
// only plain text help strings and shows the string associated with the // only plain text help strings and shows the string associated with the

4
include/wx/generic/mdig.h
View File

@@ -175,8 +175,8 @@ public:
#endif #endif
// no icon // no icon
void SetIcon( const wxIcon &icon ) { /*m_icons = wxIconBundle( icon );*/} void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
void SetIcons( const wxIconBundle &icons ) { /*m_icons = icons;*/ } void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
// no maximize etc // no maximize etc
virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ } virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ }

2
include/wx/univ/combobox.h
View File

@@ -277,7 +277,7 @@ public:
virtual int GetSelection() const; virtual int GetSelection() const;
void SetSelection(int n) { Select(n); } 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 // we have to redefine these functions here to avoid ambiguities in classes
// deriving from us which would arise otherwise because we inherit these // deriving from us which would arise otherwise because we inherit these

2
include/wx/univ/menu.h
View File

@@ -24,7 +24,7 @@
// fwd declarations // fwd declarations
class WXDLLEXPORT wxMenuInfo; class WXDLLEXPORT wxMenuInfo;
WX_DECLARE_OBJARRAY(wxMenuInfo, wxMenuInfoArray); WX_DECLARE_EXPORTED_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
class WXDLLEXPORT wxMenuGeometryInfo; class WXDLLEXPORT wxMenuGeometryInfo;
class WXDLLEXPORT wxPopupMenuWindow; class WXDLLEXPORT wxPopupMenuWindow;

2
include/wx/univ/radiobox.h
View File

@@ -21,7 +21,7 @@ class WXDLLEXPORT wxRadioButton;
#include "wx/statbox.h" #include "wx/statbox.h"
#include "wx/dynarray.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 // wxRadioBox: a box full of radio buttons

2
include/wx/univ/renderer.h
View File

@@ -671,7 +671,7 @@ public:
wxOrientation orient, wxOrientation orient,
int start, int start,
int end, int end,
int step = 1, int WXUNUSED(step) = 1,
int flags = 0, int flags = 0,
long style = 0) long style = 0)
{ m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient, { m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient,

6
src/generic/listctrl.cpp
View File

@@ -255,7 +255,7 @@ WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
#include "wx/listimpl.cpp" #include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxListItemDataList); WX_DEFINE_LIST(wxListItemDataList);
class WXDLLEXPORT wxListLineData class wxListLineData
{ {
public: public:
// the list of subitems: only may have more than one item in report mode // the list of subitems: only may have more than one item in report mode
@@ -476,7 +476,7 @@ WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
#include "wx/listimpl.cpp" #include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxListHeaderDataList); WX_DEFINE_LIST(wxListHeaderDataList);
class WXDLLEXPORT wxListMainWindow : public wxScrolledWindow class wxListMainWindow : public wxScrolledWindow
{ {
public: public:
wxListMainWindow(); wxListMainWindow();
@@ -1214,7 +1214,7 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
} }
void wxListLineData::SetPosition( int x, int y, void wxListLineData::SetPosition( int x, int y,
int window_width, int WXUNUSED(window_width),
int spacing ) int spacing )
{ {
wxListItemDataList::compatibility_iterator node = m_items.GetFirst(); wxListItemDataList::compatibility_iterator node = m_items.GetFirst();

2
src/generic/mdig.cpp
View File

@@ -571,7 +571,7 @@ void wxGenericMDIChildFrame::OnMenuHighlight(wxMenuEvent& event)
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }
void wxGenericMDIChildFrame::OnActivate(wxActivateEvent& event) void wxGenericMDIChildFrame::OnActivate(wxActivateEvent& WXUNUSED(event))
{ {
// Do mothing. // Do mothing.
} }

20
src/msw/window.cpp
View File

@@ -49,7 +49,7 @@
#include "wx/statbox.h" #include "wx/statbox.h"
#endif #endif
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
#include "wx/ownerdrw.h" #include "wx/ownerdrw.h"
#endif #endif
@@ -3520,7 +3520,16 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
// owner drawn stuff // owner drawn stuff
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
bool wxWindowMSW::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct) #if (wxUSE_OWNER_DRAWN && wxUSE_MENUS_NATIVE) || \
(wxUSE_CONTROLS && !defined(__WXUNIVERSAL__))
#define WXUNUSED_UNLESS_ODRAWN(param) param
#else
#define WXUNUSED_UNLESS_ODRAWN(param)
#endif
bool
wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
WXDRAWITEMSTRUCT * WXUNUSED_UNLESS_ODRAWN(itemStruct))
{ {
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN
@@ -3572,9 +3581,12 @@ bool wxWindowMSW::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
return FALSE; return FALSE;
} }
bool wxWindowMSW::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) bool
wxWindowMSW::MSWOnMeasureItem(int WXUNUSED_UNLESS_ODRAWN(id),
WXMEASUREITEMSTRUCT *
WXUNUSED_UNLESS_ODRAWN(itemStruct))
{ {
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__) #if wxUSE_OWNER_DRAWN && wxUSE_MENUS_NATIVE
// is it a menu item? // is it a menu item?
MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct; MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct;
if ( id == 0 && pMeasureStruct->CtlType == ODT_MENU ) if ( id == 0 && pMeasureStruct->CtlType == ODT_MENU )

8
src/univ/button.cpp
View File

@@ -82,7 +82,7 @@ bool wxButton::Create(wxWindow *parent,
style |= wxALIGN_CENTRE_HORIZONTAL | wxALIGN_CENTRE_VERTICAL; style |= wxALIGN_CENTRE_HORIZONTAL | wxALIGN_CENTRE_VERTICAL;
} }
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return FALSE; return FALSE;
SetLabel(label); SetLabel(label);
@@ -395,8 +395,8 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer,
return wxStdInputHandler::HandleMouseMove(consumer, event); return wxStdInputHandler::HandleMouseMove(consumer, event);
} }
bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer *consumer, bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer * WXUNUSED(consumer),
const wxFocusEvent& event) const wxFocusEvent& WXUNUSED(event))
{ {
// buttons change appearance when they get/lose focus, so return TRUE to // buttons change appearance when they get/lose focus, so return TRUE to
// refresh // refresh
@@ -404,7 +404,7 @@ bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer *consumer,
} }
bool wxStdButtonInputHandler::HandleActivation(wxInputConsumer *consumer, bool wxStdButtonInputHandler::HandleActivation(wxInputConsumer *consumer,
bool activated) bool WXUNUSED(activated))
{ {
// the default button changes appearance when the app is [de]activated, so // the default button changes appearance when the app is [de]activated, so
// return TRUE to refresh // return TRUE to refresh

4
src/univ/checkbox.cpp
View File

@@ -67,7 +67,7 @@ bool wxCheckBox::Create(wxWindow *parent,
const wxValidator& validator, const wxValidator& validator,
const wxString &name) const wxString &name)
{ {
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return FALSE; return FALSE;
SetLabel(label); SetLabel(label);
@@ -279,7 +279,7 @@ wxStdCheckboxInputHandler::wxStdCheckboxInputHandler(wxInputHandler *inphand)
} }
bool wxStdCheckboxInputHandler::HandleActivation(wxInputConsumer *consumer, bool wxStdCheckboxInputHandler::HandleActivation(wxInputConsumer *consumer,
bool activated) bool WXUNUSED(activated))
{ {
// only the focused checkbox appearance changes when the app gains/loses // only the focused checkbox appearance changes when the app gains/loses
// activation // activation

2
src/univ/choice.cpp
View File

@@ -43,7 +43,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
int n, const wxString choices[], int n, const wxString choices[],
long style, long WXUNUSED(style),
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {

4
src/univ/combobox.cpp
View File

@@ -93,7 +93,7 @@ public:
} }
protected: protected:
void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); } void OnButton(wxCommandEvent& WXUNUSED(event)) { m_combo->ShowPopup(); }
virtual wxSize DoGetBestClientSize() const virtual wxSize DoGetBestClientSize() const
{ {
@@ -290,7 +290,7 @@ wxComboControl::~wxComboControl()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxComboControl::DoSetSize(int x, int y, void wxComboControl::DoSetSize(int x, int y,
int width, int height, int width, int WXUNUSED(height),
int sizeFlags) int sizeFlags)
{ {
// combo height is always fixed // combo height is always fixed

2
src/univ/ctrlrend.cpp
View File

@@ -545,7 +545,7 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
} }
void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar, void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
int thumbPosOld) int WXUNUSED(thumbPosOld))
{ {
// we will only redraw the parts which must be redrawn and not everything // we will only redraw the parts which must be redrawn and not everything
wxRegion rgnUpdate = scrollbar->GetUpdateRegion(); wxRegion rgnUpdate = scrollbar->GetUpdateRegion();

6
src/univ/inpcons.cpp
View File

@@ -99,9 +99,9 @@ void wxInputConsumer::OnMouse(wxMouseEvent& event)
// the actions // the actions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool wxInputConsumer::PerformAction(const wxControlAction& action, bool wxInputConsumer::PerformAction(const wxControlAction& WXUNUSED(action),
long numArg, long WXUNUSED(numArg),
const wxString& strArg) const wxString& WXUNUSED(strArg))
{ {
return FALSE; return FALSE;
} }

4
src/univ/listbox.cpp
View File

@@ -106,7 +106,7 @@ bool wxListBox::Create(wxWindow *parent,
#endif #endif
if ( !wxControl::Create(parent, id, pos, size, style, if ( !wxControl::Create(parent, id, pos, size, style,
wxDefaultValidator, name) ) validator, name) )
return FALSE; return FALSE;
SetWindow(this); SetWindow(this);
@@ -769,7 +769,7 @@ void wxListBox::DoSetSize(int x, int y,
height = ((height - hBorders + hLine - 1) / hLine)*hLine + hBorders; height = ((height - hBorders + hLine - 1) / hLine)*hLine + hBorders;
} }
wxListBoxBase::DoSetSize(x, y, width, height); wxListBoxBase::DoSetSize(x, y, width, height, sizeFlags);
} }
wxSize wxListBox::DoGetBestClientSize() const wxSize wxListBox::DoGetBestClientSize() const

5
src/univ/notebook.cpp
View File

@@ -1389,8 +1389,9 @@ bool wxStdNotebookInputHandler::HandleMouseMove(wxInputConsumer *consumer,
return wxStdInputHandler::HandleMouseMove(consumer, event); return wxStdInputHandler::HandleMouseMove(consumer, event);
} }
bool wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer, bool
const wxFocusEvent& event) wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
const wxFocusEvent& WXUNUSED(event))
{ {
HandleFocusChange(consumer); HandleFocusChange(consumer);

2
src/univ/radiobut.cpp
View File

@@ -60,7 +60,7 @@ bool wxRadioButton::Create(wxWindow *parent,
const wxString &name) const wxString &name)
{ {
if ( !wxCheckBox::Create(parent, id, label, pos, size, style, if ( !wxCheckBox::Create(parent, id, label, pos, size, style,
wxDefaultValidator, name) ) validator, name) )
{ {
return FALSE; return FALSE;
} }

2
src/univ/scrolbar.cpp
View File

@@ -147,7 +147,7 @@ bool wxScrollBar::Create(wxWindow *parent,
// the scrollbars never have the border // the scrollbars never have the border
style &= ~wxBORDER_MASK; style &= ~wxBORDER_MASK;
if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
return FALSE; return FALSE;
SetBestSize(size); SetBestSize(size);

5
src/univ/slider.cpp
View File

@@ -1026,8 +1026,9 @@ bool wxStdSliderButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer,
return wxStdInputHandler::HandleMouseMove(consumer, event); return wxStdInputHandler::HandleMouseMove(consumer, event);
} }
bool wxStdSliderButtonInputHandler::HandleFocus(wxInputConsumer *consumer, bool
const wxFocusEvent& event) wxStdSliderButtonInputHandler::HandleFocus(wxInputConsumer * WXUNUSED(consumer),
const wxFocusEvent& WXUNUSED(event))
{ {
// slider's appearance changes when it gets/loses focus // slider's appearance changes when it gets/loses focus
return TRUE; return TRUE;

5
src/univ/textctrl.cpp
View File

@@ -4899,8 +4899,9 @@ bool wxStdTextCtrlInputHandler::HandleMouseMove(wxInputConsumer *consumer,
return wxStdInputHandler::HandleMouseMove(consumer, event); return wxStdInputHandler::HandleMouseMove(consumer, event);
} }
bool wxStdTextCtrlInputHandler::HandleFocus(wxInputConsumer *consumer, bool
const wxFocusEvent& event) wxStdTextCtrlInputHandler::HandleFocus(wxInputConsumer *consumer,
const wxFocusEvent& WXUNUSED(event))
{ {
wxTextCtrl *text = wxStaticCast(consumer->GetInputWindow(), wxTextCtrl); wxTextCtrl *text = wxStaticCast(consumer->GetInputWindow(), wxTextCtrl);

127
src/univ/themes/gtk.cpp
View File

@@ -195,15 +195,15 @@ public:
wxOrientation orient, wxOrientation orient,
int flags = 0, int flags = 0,
long style = 0); long style = 0);
virtual void DrawSliderTicks(wxDC& dc, virtual void DrawSliderTicks(wxDC& WXUNUSED(dc),
const wxRect& rect, const wxRect& WXUNUSED(rect),
int lenThumb, int WXUNUSED(lenThumb),
wxOrientation orient, wxOrientation WXUNUSED(orient),
int start, int WXUNUSED(start),
int end, int WXUNUSED(end),
int step = 1, int WXUNUSED(step) = 1,
int flags = 0, int WXUNUSED(flags) = 0,
long style = 0) long WXUNUSED(style) = 0)
{ {
// we don't have the ticks in GTK version // we don't have the ticks in GTK version
} }
@@ -591,7 +591,7 @@ protected:
// wxGTKTheme // wxGTKTheme
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DEFINE_ARRAY(wxInputHandler *, wxArrayHandlers); WX_DEFINE_ARRAY_NO_PTR(wxInputHandler *, wxArrayHandlers);
class wxGTKTheme : public wxTheme class wxGTKTheme : public wxTheme
{ {
@@ -980,7 +980,7 @@ void wxGTKRenderer::DrawAntiRaisedBorder(wxDC& dc, wxRect *rect)
void wxGTKRenderer::DrawBorder(wxDC& dc, void wxGTKRenderer::DrawBorder(wxDC& dc,
wxBorder border, wxBorder border,
const wxRect& rectTotal, const wxRect& rectTotal,
int flags, int WXUNUSED(flags),
wxRect *rectIn) wxRect *rectIn)
{ {
size_t width; size_t width;
@@ -1634,7 +1634,7 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc,
const wxBitmap& bitmap, const wxBitmap& bitmap,
const wxRect& rectOrig, const wxRect& rectOrig,
int flags, int flags,
long style) long WXUNUSED(style))
{ {
// we don't draw the separators at all // we don't draw the separators at all
if ( !label.empty() || bitmap.Ok() ) if ( !label.empty() || bitmap.Ok() )
@@ -1663,7 +1663,7 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc,
// text control // text control
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl *text, wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl * WXUNUSED(text),
const wxRect& rect) const const wxRect& rect) const
{ {
wxRect rectTotal = rect; wxRect rectTotal = rect;
@@ -1897,19 +1897,19 @@ wxSize wxGTKRenderer::GetSliderThumbSize(const wxRect& rect,
} }
wxRect wxGTKRenderer::GetSliderShaftRect(const wxRect& rect, wxRect wxGTKRenderer::GetSliderShaftRect(const wxRect& rect,
int lenThumb, int WXUNUSED(lenThumb),
wxOrientation WXUNUSED(orient), wxOrientation WXUNUSED(orient),
long style) const long WXUNUSED(style)) const
{ {
return rect.Deflate(2*BORDER_THICKNESS, 2*BORDER_THICKNESS); return rect.Deflate(2*BORDER_THICKNESS, 2*BORDER_THICKNESS);
} }
void wxGTKRenderer::DrawSliderShaft(wxDC& dc, void wxGTKRenderer::DrawSliderShaft(wxDC& dc,
const wxRect& rectOrig, const wxRect& rectOrig,
int lenThumb, int WXUNUSED(lenThumb),
wxOrientation orient, wxOrientation WXUNUSED(orient),
int flags, int flags,
long style, long WXUNUSED(style),
wxRect *rectShaft) wxRect *rectShaft)
{ {
wxRect rect = rectOrig; wxRect rect = rectOrig;
@@ -1936,8 +1936,8 @@ void wxGTKRenderer::DrawSliderShaft(wxDC& dc,
void wxGTKRenderer::DrawSliderThumb(wxDC& dc, void wxGTKRenderer::DrawSliderThumb(wxDC& dc,
const wxRect& rectOrig, const wxRect& rectOrig,
wxOrientation orient, wxOrientation orient,
int flags, int WXUNUSED(flags),
long style) long WXUNUSED(style))
{ {
// draw the thumb border // draw the thumb border
wxRect rect = rectOrig; wxRect rect = rectOrig;
@@ -2227,15 +2227,16 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win,
// status bar // status bar
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxSize wxGTKRenderer::GetStatusBarBorders(wxCoord *borderBetweenFields) const wxSize
wxGTKRenderer::GetStatusBarBorders(wxCoord * WXUNUSED(borderBetweenFields)) const
{ {
return wxSize(0, 0); return wxSize(0, 0);
} }
void wxGTKRenderer::DrawStatusField(wxDC& dc, void wxGTKRenderer::DrawStatusField(wxDC& WXUNUSED(dc),
const wxRect& rect, const wxRect& WXUNUSED(rect),
const wxString& label, const wxString& WXUNUSED(label),
int flags) int WXUNUSED(flags))
{ {
} }
@@ -2304,7 +2305,7 @@ void wxGTKRenderer::GetComboBitmaps(wxBitmap *bmpNormal,
void wxGTKRenderer::DoDrawBackground(wxDC& dc, void wxGTKRenderer::DoDrawBackground(wxDC& dc,
const wxColour& col, const wxColour& col,
const wxRect& rect, const wxRect& rect,
wxWindow *window ) wxWindow * WXUNUSED(window))
{ {
wxBrush brush(col, wxSOLID); wxBrush brush(col, wxSOLID);
dc.SetBrush(brush); dc.SetBrush(brush);
@@ -2650,7 +2651,7 @@ void wxGTKRenderer::DrawScrollbarThumb(wxDC& dc,
void wxGTKRenderer::DrawScrollbarShaft(wxDC& dc, void wxGTKRenderer::DrawScrollbarShaft(wxDC& dc,
wxOrientation orient, wxOrientation orient,
const wxRect& rect, const wxRect& rect,
int flags) int WXUNUSED(flags))
{ {
wxRect rectBar = rect; wxRect rectBar = rect;
DrawThumbBorder(dc, &rectBar, orient); DrawThumbBorder(dc, &rectBar, orient);
@@ -2756,60 +2757,65 @@ void wxGTKRenderer::AdjustSize(wxSize *size, const wxWindow *window)
// top level windows // top level windows
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxGTKRenderer::DrawFrameTitleBar(wxDC& dc, void wxGTKRenderer::DrawFrameTitleBar(wxDC& WXUNUSED(dc),
const wxRect& rect, const wxRect& WXUNUSED(rect),
const wxString& title, const wxString& WXUNUSED(title),
const wxIcon& icon, const wxIcon& WXUNUSED(icon),
int flags, int WXUNUSED(flags),
int specialButton, int WXUNUSED(specialButton),
int specialButtonFlag) int WXUNUSED(specialButtonFlag))
{ {
} }
void wxGTKRenderer::DrawFrameBorder(wxDC& dc, void wxGTKRenderer::DrawFrameBorder(wxDC& WXUNUSED(dc),
const wxRect& rect, const wxRect& WXUNUSED(rect),
int flags) int WXUNUSED(flags))
{ {
} }
void wxGTKRenderer::DrawFrameBackground(wxDC& dc, void wxGTKRenderer::DrawFrameBackground(wxDC& WXUNUSED(dc),
const wxRect& rect, const wxRect& WXUNUSED(rect),
int flags) int WXUNUSED(flags))
{ {
} }
void wxGTKRenderer::DrawFrameTitle(wxDC& dc, void wxGTKRenderer::DrawFrameTitle(wxDC& WXUNUSED(dc),
const wxRect& rect, const wxRect& WXUNUSED(rect),
const wxString& title, const wxString& WXUNUSED(title),
int flags) int WXUNUSED(flags))
{ {
} }
void wxGTKRenderer::DrawFrameIcon(wxDC& dc, void wxGTKRenderer::DrawFrameIcon(wxDC& WXUNUSED(dc),
const wxRect& rect, const wxRect& WXUNUSED(rect),
const wxIcon& icon, const wxIcon& WXUNUSED(icon),
int flags) int WXUNUSED(flags))
{ {
} }
void wxGTKRenderer::DrawFrameButton(wxDC& dc, void wxGTKRenderer::DrawFrameButton(wxDC& WXUNUSED(dc),
wxCoord x, wxCoord y, wxCoord WXUNUSED(x),
int button, wxCoord WXUNUSED(y),
int flags) int WXUNUSED(button),
int WXUNUSED(flags))
{ {
} }
wxRect wxGTKRenderer::GetFrameClientArea(const wxRect& rect, int flags) const wxRect
wxGTKRenderer::GetFrameClientArea(const wxRect& rect,
int WXUNUSED(flags)) const
{ {
return rect; return rect;
} }
wxSize wxGTKRenderer::GetFrameTotalSize(const wxSize& clientSize, int flags) const wxSize
wxGTKRenderer::GetFrameTotalSize(const wxSize& clientSize,
int WXUNUSED(flags)) const
{ {
return clientSize; return clientSize;
} }
wxSize wxGTKRenderer::GetFrameMinSize(int flags) const wxSize wxGTKRenderer::GetFrameMinSize(int WXUNUSED(flags)) const
{ {
return wxSize(0,0); return wxSize(0,0);
} }
@@ -2819,7 +2825,10 @@ wxSize wxGTKRenderer::GetFrameIconSize() const
return wxSize(-1, -1); return wxSize(-1, -1);
} }
int wxGTKRenderer::HitTestFrame(const wxRect& rect, const wxPoint& pt, int flags) const int
wxGTKRenderer::HitTestFrame(const wxRect& WXUNUSED(rect),
const wxPoint& WXUNUSED(pt),
int WXUNUSED(flags)) const
{ {
return wxHT_TOPLEVEL_CLIENT_AREA; return wxHT_TOPLEVEL_CLIENT_AREA;
} }
@@ -4462,9 +4471,9 @@ wxGTKInputHandler::wxGTKInputHandler(wxGTKRenderer *renderer)
m_renderer = renderer; m_renderer = renderer;
} }
bool wxGTKInputHandler::HandleKey(wxInputConsumer *control, bool wxGTKInputHandler::HandleKey(wxInputConsumer * WXUNUSED(control),
const wxKeyEvent& event, const wxKeyEvent& WXUNUSED(event),
bool pressed) bool WXUNUSED(pressed))
{ {
return FALSE; return FALSE;
} }

20
src/univ/themes/metal.cpp
View File

@@ -87,10 +87,10 @@ public:
wxMetalRenderer(wxRenderer *renderer, wxColourScheme* scheme); wxMetalRenderer(wxRenderer *renderer, wxColourScheme* scheme);
virtual void DrawButtonSurface(wxDC& dc, virtual void DrawButtonSurface(wxDC& dc,
const wxColour& col, const wxColour& WXUNUSED(col),
const wxRect& rect, const wxRect& rect,
int flags ) int WXUNUSED(flags))
{ DrawMetal( dc, rect ); } { DrawMetal(dc, rect); }
virtual void DrawScrollbarThumb(wxDC& dc, virtual void DrawScrollbarThumb(wxDC& dc,
wxOrientation orient, wxOrientation orient,
@@ -141,7 +141,7 @@ private:
// wxMetalTheme // wxMetalTheme
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DEFINE_ARRAY(wxInputHandler *, wxArrayHandlers); WX_DEFINE_ARRAY_NO_PTR(wxInputHandler *, wxArrayHandlers);
class wxMetalTheme : public wxTheme class wxMetalTheme : public wxTheme
{ {
@@ -406,9 +406,9 @@ wxMetalRenderer::wxMetalRenderer(wxRenderer *renderer, wxColourScheme *scheme)
} }
void wxMetalRenderer::DrawScrollbarThumb(wxDC& dc, void wxMetalRenderer::DrawScrollbarThumb(wxDC& dc,
wxOrientation orient, wxOrientation WXUNUSED(orient),
const wxRect& rect, const wxRect& rect,
int flags) int WXUNUSED(flags))
{ {
// we don't use the flags, the thumb never changes appearance // we don't use the flags, the thumb never changes appearance
wxRect rectThumb = rect; wxRect rectThumb = rect;
@@ -417,15 +417,15 @@ void wxMetalRenderer::DrawScrollbarThumb(wxDC& dc,
} }
void wxMetalRenderer::DrawScrollbarShaft(wxDC& dc, void wxMetalRenderer::DrawScrollbarShaft(wxDC& dc,
wxOrientation orient, wxOrientation WXUNUSED(orient),
const wxRect& rectBar, const wxRect& rectBar,
int flags) int WXUNUSED(flags))
{ {
DrawMetal( dc, rectBar ); DrawMetal(dc, rectBar);
} }
void wxMetalRenderer::GetComboBitmaps(wxBitmap *bmpNormal, void wxMetalRenderer::GetComboBitmaps(wxBitmap *bmpNormal,
wxBitmap *bmpFocus, wxBitmap * WXUNUSED(bmpFocus),
wxBitmap *bmpPressed, wxBitmap *bmpPressed,
wxBitmap *bmpDisabled) wxBitmap *bmpDisabled)
{ {

50
src/univ/themes/win32.cpp
View File

@@ -549,7 +549,8 @@ public:
protected: protected:
virtual bool IsAllowedButton(int button) { return button == 1; } virtual bool IsAllowedButton(int button) { return button == 1; }
virtual void Highlight(wxScrollBar *scrollbar, bool doIt) virtual void Highlight(wxScrollBar * WXUNUSED(scrollbar),
bool WXUNUSED(doIt))
{ {
// we don't highlight anything // we don't highlight anything
} }
@@ -657,7 +658,7 @@ protected:
// wxWin32Theme // wxWin32Theme
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DEFINE_ARRAY(wxInputHandler *, wxArrayHandlers); WX_DEFINE_ARRAY_NO_PTR(wxInputHandler *, wxArrayHandlers);
class wxWin32Theme : public wxTheme class wxWin32Theme : public wxTheme
{ {
@@ -2453,7 +2454,9 @@ void wxWin32Renderer::DrawTextLine(wxDC& dc,
StandardDrawTextLine(dc, text, rect, selStart, selEnd, flags); StandardDrawTextLine(dc, text, rect, selStart, selEnd, flags);
} }
void wxWin32Renderer::DrawLineWrapMark(wxDC& dc, const wxRect& rect) void
wxWin32Renderer::DrawLineWrapMark(wxDC& WXUNUSED(dc),
const wxRect& WXUNUSED(rect))
{ {
// we don't draw them // we don't draw them
} }
@@ -2584,9 +2587,10 @@ void wxWin32Renderer::DrawTab(wxDC& dc,
// slider // slider
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxSize wxWin32Renderer::GetSliderThumbSize(const wxRect& rect, wxSize
int lenThumb, wxWin32Renderer::GetSliderThumbSize(const wxRect& WXUNUSED(rect),
wxOrientation orient) const int lenThumb,
wxOrientation orient) const
{ {
wxSize size; wxSize size;
wxCoord width = wxMax (lenThumb, SLIDER_THUMB_LENGTH) / 2; wxCoord width = wxMax (lenThumb, SLIDER_THUMB_LENGTH) / 2;
@@ -2857,7 +2861,7 @@ void wxWin32Renderer::DrawSliderTicks(wxDC& dc,
int start, int start,
int end, int end,
int step, int step,
int flags, int WXUNUSED(flags),
long style) long style)
{ {
/* show ticks geometry /* show ticks geometry
@@ -3271,7 +3275,7 @@ void wxWin32Renderer::DrawStatusField(wxDC& dc,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxWin32Renderer::GetComboBitmaps(wxBitmap *bmpNormal, void wxWin32Renderer::GetComboBitmaps(wxBitmap *bmpNormal,
wxBitmap *bmpFocus, wxBitmap * WXUNUSED(bmpFocus),
wxBitmap *bmpPressed, wxBitmap *bmpPressed,
wxBitmap *bmpDisabled) wxBitmap *bmpDisabled)
{ {
@@ -3312,7 +3316,7 @@ void wxWin32Renderer::GetComboBitmaps(wxBitmap *bmpNormal,
void wxWin32Renderer::DoDrawBackground(wxDC& dc, void wxWin32Renderer::DoDrawBackground(wxDC& dc,
const wxColour& col, const wxColour& col,
const wxRect& rect, const wxRect& rect,
wxWindow *window ) wxWindow * WXUNUSED(window))
{ {
wxBrush brush(col, wxSOLID); wxBrush brush(col, wxSOLID);
dc.SetBrush(brush); dc.SetBrush(brush);
@@ -3323,8 +3327,8 @@ void wxWin32Renderer::DoDrawBackground(wxDC& dc,
void wxWin32Renderer::DrawBackground(wxDC& dc, void wxWin32Renderer::DrawBackground(wxDC& dc,
const wxColour& col, const wxColour& col,
const wxRect& rect, const wxRect& rect,
int flags, int WXUNUSED(flags),
wxWindow *window ) wxWindow *window)
{ {
// just fill it with the given or default bg colour // just fill it with the given or default bg colour
wxColour colBg = col.Ok() ? col : wxSCHEME_COLOUR(m_scheme, CONTROL); wxColour colBg = col.Ok() ? col : wxSCHEME_COLOUR(m_scheme, CONTROL);
@@ -3400,9 +3404,9 @@ void wxWin32Renderer::DrawArrowButton(wxDC& dc,
} }
void wxWin32Renderer::DrawScrollbarThumb(wxDC& dc, void wxWin32Renderer::DrawScrollbarThumb(wxDC& dc,
wxOrientation orient, wxOrientation WXUNUSED(orient),
const wxRect& rect, const wxRect& rect,
int flags) int WXUNUSED(flags))
{ {
// we don't use the flags, the thumb never changes appearance // we don't use the flags, the thumb never changes appearance
wxRect rectThumb = rect; wxRect rectThumb = rect;
@@ -3411,7 +3415,7 @@ void wxWin32Renderer::DrawScrollbarThumb(wxDC& dc,
} }
void wxWin32Renderer::DrawScrollbarShaft(wxDC& dc, void wxWin32Renderer::DrawScrollbarShaft(wxDC& dc,
wxOrientation orient, wxOrientation WXUNUSED(orient),
const wxRect& rectBar, const wxRect& rectBar,
int flags) int flags)
{ {
@@ -4020,8 +4024,9 @@ static inline int GetTextBorderWidth()
return 1; return 1;
} }
wxRect wxWin32Renderer::GetTextTotalArea(const wxTextCtrl *text, wxRect
const wxRect& rect) const wxWin32Renderer::GetTextTotalArea(const wxTextCtrl * WXUNUSED(text),
const wxRect& rect) const
{ {
wxRect rectTotal = rect; wxRect rectTotal = rect;
@@ -4034,9 +4039,10 @@ wxRect wxWin32Renderer::GetTextTotalArea(const wxTextCtrl *text,
return rectTotal; return rectTotal;
} }
wxRect wxWin32Renderer::GetTextClientArea(const wxTextCtrl *text, wxRect
const wxRect& rect, wxWin32Renderer::GetTextClientArea(const wxTextCtrl * WXUNUSED(text),
wxCoord *extraSpaceBeyond) const const wxRect& rect,
wxCoord *extraSpaceBeyond) const
{ {
wxRect rectText = rect; wxRect rectText = rect;
@@ -4125,9 +4131,9 @@ wxWin32InputHandler::wxWin32InputHandler(wxWin32Renderer *renderer)
m_renderer = renderer; m_renderer = renderer;
} }
bool wxWin32InputHandler::HandleKey(wxInputConsumer *control, bool wxWin32InputHandler::HandleKey(wxInputConsumer * WXUNUSED(control),
const wxKeyEvent& event, const wxKeyEvent& WXUNUSED(event),
bool pressed) bool WXUNUSED(pressed))
{ {
return FALSE; return FALSE;
} }

4
src/univ/toolbar.cpp
View File

@@ -849,9 +849,9 @@ bool wxStdToolbarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
} }
bool wxStdToolbarInputHandler::HandleFocus(wxInputConsumer *consumer, bool wxStdToolbarInputHandler::HandleFocus(wxInputConsumer *consumer,
const wxFocusEvent& event) const wxFocusEvent& WXUNUSED(event))
{ {
if (m_toolCapture) if ( m_toolCapture )
{ {
// We shouldn't be left with a highlighted button // We shouldn't be left with a highlighted button
consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() ); consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() );

6
src/univ/topluniv.cpp
View File

@@ -471,7 +471,7 @@ void wxInteractiveMoveHandler::OnMouseMove(wxMouseEvent& event)
} }
} }
void wxInteractiveMoveHandler::OnMouseDown(wxMouseEvent& event) void wxInteractiveMoveHandler::OnMouseDown(wxMouseEvent& WXUNUSED(event))
{ {
if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT ) if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
{ {
@@ -598,7 +598,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
} }
} }
void wxInteractiveMoveHandler::OnMouseUp(wxMouseEvent& event) void wxInteractiveMoveHandler::OnMouseUp(wxMouseEvent& WXUNUSED(event))
{ {
m_data.m_evtLoop->Exit(); m_data.m_evtLoop->Exit();
} }
@@ -691,7 +691,7 @@ void wxTopLevelWindow::ClickTitleBarButton(long button)
bool wxTopLevelWindow::PerformAction(const wxControlAction& action, bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
long numArg, long numArg,
const wxString& strArg) const wxString& WXUNUSED(strArg))
{ {
bool isActive = numArg != 0; bool isActive = numArg != 0;

6
src/univ/winuniv.cpp
View File

@@ -182,7 +182,7 @@ const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the event handlers executed when the window must be repainted // the event handlers executed when the window must be repainted
void wxWindow::OnNcPaint(wxPaintEvent& event) void wxWindow::OnNcPaint(wxPaintEvent& WXUNUSED(event))
{ {
if ( m_renderer ) if ( m_renderer )
{ {
@@ -340,7 +340,7 @@ void wxWindow::DoDrawBorder(wxDC& dc, const wxRect& rect)
} }
} }
void wxWindow::DoDraw(wxControlRenderer *renderer) void wxWindow::DoDraw(wxControlRenderer * WXUNUSED(renderer))
{ {
} }
@@ -891,7 +891,7 @@ void wxWindow::SetScrollbar(int orient,
} }
} }
void wxWindow::SetScrollPos(int orient, int pos, bool refresh) void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
{ {
wxScrollBar *scrollbar = GetScrollbar(orient); wxScrollBar *scrollbar = GetScrollbar(orient);
wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") ); wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );