unused parameter warnings suppressed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-09-18 16:57:21 +00:00
parent 45c94d784d
commit 6e31e94063
5 changed files with 39 additions and 34 deletions

View File

@@ -52,16 +52,18 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
public: public:
wxHtmlCell() : wxObject() {m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0;}; wxHtmlCell() : wxObject() {m_Next = NULL; m_Parent = NULL; m_Width = m_Height = m_Descent = 0;};
virtual ~wxHtmlCell() {if (m_Next) delete m_Next;}; virtual ~wxHtmlCell() {if (m_Next) delete m_Next;};
void SetParent(wxHtmlContainerCell *p) {m_Parent = p;} void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
wxHtmlContainerCell *GetParent() const {return m_Parent;} wxHtmlContainerCell *GetParent() const {return m_Parent;}
int GetPosX() const {return m_PosX;} int GetPosX() const {return m_PosX;}
int GetPosY() const {return m_PosY;} int GetPosY() const {return m_PosY;}
int GetWidth() const {return m_Width;} int GetWidth() const {return m_Width;}
int GetHeight() const {return m_Height;} int GetHeight() const {return m_Height;}
int GetDescent() const {return m_Descent;} int GetDescent() const {return m_Descent;}
virtual wxString GetLink(int x = 0, int y = 0) const {return m_Link;} virtual wxString GetLink(int WXUNUSED(x) = 0,
int WXUNUSED(y) = 0) const
{ return m_Link; }
// returns the link associated with this cell. The position is position within // returns the link associated with this cell. The position is position within
// the cell so it varies from 0 to m_Width, from 0 to m_Height // the cell so it varies from 0 to m_Width, from 0 to m_Height
wxHtmlCell *GetNext() const {return m_Next;} wxHtmlCell *GetNext() const {return m_Next;}
@@ -84,7 +86,7 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
virtual void DrawInvisible(wxDC& dc, int x, int y) {if (m_Next) m_Next -> DrawInvisible(dc, x, y);}; virtual void DrawInvisible(wxDC& dc, int x, int y) {if (m_Next) m_Next -> DrawInvisible(dc, x, y);};
// proceed drawing actions in case the cell is not visible (scrolled out of screen). // proceed drawing actions in case the cell is not visible (scrolled out of screen).
// This is needed to change fonts, colors and so on // This is needed to change fonts, colors and so on
virtual const wxHtmlCell* Find(int condition, const void* param) const {if (m_Next) return m_Next -> Find(condition, param); else return NULL;} virtual const wxHtmlCell* Find(int condition, const void* param) const {if (m_Next) return m_Next -> Find(condition, param); else return NULL;}
// This method returns pointer to the FIRST cell for that // This method returns pointer to the FIRST cell for that
// the condition // the condition
@@ -170,7 +172,7 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
virtual void Layout(int w); virtual void Layout(int w);
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
virtual void DrawInvisible(wxDC& dc, int x, int y); virtual void DrawInvisible(wxDC& dc, int x, int y);
void InsertCell(wxHtmlCell *cell); void InsertCell(wxHtmlCell *cell);
// insert cell at the end of m_Cells list // insert cell at the end of m_Cells list
void SetAlignHor(int al) {m_AlignHor = al;} void SetAlignHor(int al) {m_AlignHor = al;}

View File

@@ -100,7 +100,7 @@ class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser
void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes); void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes);
// sets fonts to be used when displaying HTML page. // sets fonts to be used when displaying HTML page.
// *_italic_mode can be either wxSLANT or wxITALIC // *_italic_mode can be either wxSLANT or wxITALIC
virtual wxList* GetTempData(); virtual wxList* GetTempData();
static void AddModule(wxHtmlTagsModule *module); static void AddModule(wxHtmlTagsModule *module);
@@ -175,7 +175,7 @@ class WXDLLEXPORT wxHtmlWinTagHandler : public wxHtmlTagHandler
public: public:
wxHtmlWinTagHandler() : wxHtmlTagHandler() {}; wxHtmlWinTagHandler() : wxHtmlTagHandler() {};
virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}; virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;};
}; };
@@ -202,7 +202,7 @@ class WXDLLEXPORT wxHtmlTagsModule : public wxModule
virtual bool OnInit(); virtual bool OnInit();
virtual void OnExit(); virtual void OnExit();
virtual void FillHandlersTable(wxHtmlWinParser *parser) {} virtual void FillHandlersTable(wxHtmlWinParser * WXUNUSED(parser)) { }
// This is called by wxHtmlWinParser. // This is called by wxHtmlWinParser.
// The method must simply call parser->AddTagHandler(new <handler_class_name>); // The method must simply call parser->AddTagHandler(new <handler_class_name>);
// for each handler // for each handler

View File

@@ -70,12 +70,12 @@ void Client_OnRequest(wxSocketBase& sock,
// wxTCPClient // wxTCPClient
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
wxTCPClient::wxTCPClient (void) wxTCPClient::wxTCPClient ()
: wxClientBase() : wxClientBase()
{ {
} }
wxTCPClient::~wxTCPClient (void) wxTCPClient::~wxTCPClient ()
{ {
} }
@@ -147,7 +147,7 @@ wxConnectionBase *wxTCPClient::OnMakeConnection()
// wxTCPServer // wxTCPServer
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
wxTCPServer::wxTCPServer (void) wxTCPServer::wxTCPServer ()
: wxServerBase() : wxServerBase()
{ {
} }
@@ -169,7 +169,7 @@ bool wxTCPServer::Create(const wxString& server_name)
return TRUE; return TRUE;
} }
wxTCPServer::~wxTCPServer(void) wxTCPServer::~wxTCPServer()
{ {
} }
@@ -182,17 +182,17 @@ wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topi
// wxTCPConnection // wxTCPConnection
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
wxTCPConnection::wxTCPConnection (void) wxTCPConnection::wxTCPConnection ()
: wxConnectionBase(), : wxConnectionBase(),
m_sock(NULL), m_sockstrm(NULL), m_codeci(NULL), m_codeco(NULL) m_sock(NULL), m_sockstrm(NULL), m_codeci(NULL), m_codeco(NULL)
{ {
} }
wxTCPConnection::wxTCPConnection(char *buffer, int size) wxTCPConnection::wxTCPConnection(char * WXUNUSED(buffer), int WXUNUSED(size))
{ {
} }
wxTCPConnection::~wxTCPConnection (void) wxTCPConnection::~wxTCPConnection ()
{ {
wxDELETE(m_sock); wxDELETE(m_sock);
wxDELETE(m_codeci); wxDELETE(m_codeci);
@@ -206,7 +206,7 @@ void wxTCPConnection::Compress(bool WXUNUSED(on))
} }
// Calls that CLIENT can make. // Calls that CLIENT can make.
bool wxTCPConnection::Disconnect (void) bool wxTCPConnection::Disconnect ()
{ {
// Send the the disconnect message to the peer. // Send the the disconnect message to the peer.
m_codeco->Write8(IPC_DISCONNECT); m_codeco->Write8(IPC_DISCONNECT);

View File

@@ -863,7 +863,8 @@ char *wxSocketBase::CallbackData(char *data)
// wxSocketBase automatic notifier // wxSocketBase automatic notifier
// -------------------------------------------------------------- // --------------------------------------------------------------
static void LINKAGEMODE wx_socket_callback(GSocket *socket, GSocketEvent event, char *cdata) static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
GSocketEvent event, char *cdata)
{ {
wxSocketBase *sckobj = (wxSocketBase *)cdata; wxSocketBase *sckobj = (wxSocketBase *)cdata;
@@ -940,7 +941,7 @@ void wxSocketBase::OnRequest(wxSocketNotify req_evt)
} }
} }
void wxSocketBase::OldOnNotify(wxSocketNotify evt) void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt))
{ {
} }

View File

@@ -449,11 +449,11 @@ bool wxPropertyListView::CreateControls()
else else
{ {
m_confirmButton = new wxButton(panel, wxID_PROP_CHECK, ":-)", wxPoint(-1, -1), smallButtonSize ); m_confirmButton = new wxButton(panel, wxID_PROP_CHECK, ":-)", wxPoint(-1, -1), smallButtonSize );
m_cancelButton = new wxButton(panel, wxID_PROP_CROSS, "X", wxPoint(-1, -1), smallButtonSize ); m_cancelButton = new wxButton(panel, wxID_PROP_CROSS, "X", wxPoint(-1, -1), smallButtonSize );
} }
topsizer->Add( m_confirmButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder ); topsizer->Add( m_confirmButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
topsizer->Add( m_cancelButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder ); topsizer->Add( m_cancelButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
} }
m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, "", m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, "",
@@ -465,7 +465,7 @@ bool wxPropertyListView::CreateControls()
{ {
m_editButton = new wxButton(panel, wxID_PROP_EDIT, "...", wxPoint(-1, -1), smallButtonSize); m_editButton = new wxButton(panel, wxID_PROP_EDIT, "...", wxPoint(-1, -1), smallButtonSize);
m_editButton->Enable(FALSE); m_editButton->Enable(FALSE);
topsizer->Add( m_editButton, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder ); topsizer->Add( m_editButton, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
} }
mainsizer->Add( topsizer, 0, wxEXPAND ); mainsizer->Add( topsizer, 0, wxEXPAND );
@@ -487,8 +487,8 @@ bool wxPropertyListView::CreateControls()
if ((m_buttonFlags & wxPROP_BUTTON_OK) || if ((m_buttonFlags & wxPROP_BUTTON_OK) ||
(m_buttonFlags & wxPROP_BUTTON_CLOSE) || (m_buttonFlags & wxPROP_BUTTON_CLOSE) ||
(m_buttonFlags & wxPROP_BUTTON_CANCEL) || (m_buttonFlags & wxPROP_BUTTON_CANCEL) ||
(m_buttonFlags & wxPROP_BUTTON_HELP)) (m_buttonFlags & wxPROP_BUTTON_HELP))
{ {
wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
buttonborder = 5; buttonborder = 5;
@@ -515,7 +515,7 @@ bool wxPropertyListView::CreateControls()
m_windowHelpButton = new wxButton(panel, wxID_HELP, _("Help"), wxPoint(-1, -1), largeButtonSize ); m_windowHelpButton = new wxButton(panel, wxID_HELP, _("Help"), wxPoint(-1, -1), largeButtonSize );
bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder ); bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
} }
mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND ); mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND );
} }
@@ -539,9 +539,9 @@ void wxPropertyListView::ShowListBoxControl(bool show)
if (m_buttonFlags & wxPROP_DYNAMIC_VALUE_FIELD) if (m_buttonFlags & wxPROP_DYNAMIC_VALUE_FIELD)
{ {
if (show) if (show)
m_middleSizer->Prepend( m_valueList, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 3 ); m_middleSizer->Prepend( m_valueList, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 3 );
else else
m_middleSizer->Remove( 0 ); m_middleSizer->Remove( 0 );
m_propertyWindow->Layout(); m_propertyWindow->Layout();
} }
@@ -1786,10 +1786,12 @@ void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
} }
} }
void wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& event) void
wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{ {
SaveCurrentSelection(); SaveCurrentSelection();
this->Destroy();
Destroy();
} }
void wxPropertyStringListEditorDialog::SaveCurrentSelection(void) void wxPropertyStringListEditorDialog::SaveCurrentSelection(void)
@@ -1850,9 +1852,9 @@ bool wxPropertyModule::OnInit()
if (!gs_tickBitmap || !gs_crossBitmap || !gs_tickBitmap->Ok() || !gs_crossBitmap->Ok()) if (!gs_tickBitmap || !gs_crossBitmap || !gs_tickBitmap->Ok() || !gs_crossBitmap->Ok())
{ {
if (gs_tickBitmap) delete gs_tickBitmap; if (gs_tickBitmap) delete gs_tickBitmap;
if (gs_crossBitmap) delete gs_crossBitmap; if (gs_crossBitmap) delete gs_crossBitmap;
gs_tickBitmap = (wxBitmap*) NULL; gs_tickBitmap = (wxBitmap*) NULL;
gs_crossBitmap = (wxBitmap*) NULL; gs_crossBitmap = (wxBitmap*) NULL;
} }
return TRUE; return TRUE;