Added WXUNUSED_GTK and WXUNUSED_GTK_AND_MOTIF

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-03-11 17:28:36 +00:00
parent 451868847b
commit c78b3acd0c

View File

@@ -52,6 +52,18 @@
#include "wx/grid.h" #include "wx/grid.h"
#include "wx/generic/gridsel.h" #include "wx/generic/gridsel.h"
#if defined(__WXGTK__) || defined(__WXMOTIF__)
#define WXUNUSED_GTK_AND_MOTIF(identifier) WXUNUSED(identifier)
#else
#define WXUNUSED_GTK_AND_MOTIF(identifier) identifier
#endif
#if defined(__WXGTK__)
#define WXUNUSED_GTK(identifier) WXUNUSED(identifier)
#else
#define WXUNUSED_GTK(identifier) identifier
#endif
// Required for wxIs... functions // Required for wxIs... functions
#include <ctype.h> #include <ctype.h>
@@ -286,6 +298,7 @@ WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
class WXDLLEXPORT wxGridTypeRegistry class WXDLLEXPORT wxGridTypeRegistry
{ {
public: public:
wxGridTypeRegistry() {}
~wxGridTypeRegistry(); ~wxGridTypeRegistry();
void RegisterDataType(const wxString& typeName, void RegisterDataType(const wxString& typeName,
@@ -606,7 +619,8 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
event.Skip(); event.Skip();
} }
void wxGridCellTextEditor::HandleReturn(wxKeyEvent& event) void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
WXUNUSED_GTK_AND_MOTIF(event) )
{ {
#if defined(__WXMOTIF__) || defined(__WXGTK__) #if defined(__WXMOTIF__) || defined(__WXGTK__)
// wxMotif needs a little extra help... // wxMotif needs a little extra help...
@@ -1173,7 +1187,7 @@ void wxGridCellRenderer::Draw(wxGrid& grid,
wxGridCellAttr& attr, wxGridCellAttr& attr,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int row, int col, int WXUNUSED(row), int WXUNUSED(col),
bool isSelected) bool isSelected)
{ {
dc.SetBackgroundMode( wxSOLID ); dc.SetBackgroundMode( wxSOLID );
@@ -5519,7 +5533,7 @@ void wxGrid::DrawHighlight(wxDC& dc)
// This is used to redraw all grid lines e.g. when the grid line colour // This is used to redraw all grid lines e.g. when the grid line colour
// has been changed // has been changed
// //
void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg ) void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED_GTK(reg) )
{ {
if ( !m_gridLinesEnabled || if ( !m_gridLinesEnabled ||
!m_numRows || !m_numRows ||