From 5e0201eaa1e299cb5c37246324464e6e2dce7584 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 4 Oct 1999 15:07:20 +0000 Subject: [PATCH] Removed some unused parameter warnings; compile error in dialup.cpp corrected; some commits are redundant (sorry) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/generic.rsp | 9 +++++++++ distrib/msw/glcanvas.rsp | 1 + distrib/msw/gtk.rsp | 3 +++ distrib/msw/makefile.rsp | 1 + distrib/msw/msw.rsp | 1 - distrib/msw/ogl.rsp | 1 + include/wx/dialup.h | 4 ++++ include/wx/generic/helphtml.h | 14 +++++++------- include/wx/helpbase.h | 16 ++++++++-------- src/common/fontcmn.cpp | 4 ++-- src/common/image.cpp | 2 +- src/common/imagpcx.cpp | 4 ++-- src/common/stream.cpp | 2 +- src/generic/filedlgg.cpp | 4 ++-- src/generic/helpwxht.cpp | 2 +- src/generic/logg.cpp | 2 +- src/gtk/dataobj.cpp | 2 +- src/gtk/font.cpp | 2 +- src/gtk/fontdlg.cpp | 2 +- src/gtk/frame.cpp | 4 ++-- src/gtk/mdi.cpp | 2 +- src/gtk/window.cpp | 2 +- src/gtk1/dataobj.cpp | 2 +- src/gtk1/font.cpp | 2 +- src/gtk1/fontdlg.cpp | 2 +- src/gtk1/frame.cpp | 4 ++-- src/gtk1/mdi.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/unix/dialup.cpp | 8 ++++++-- 29 files changed, 64 insertions(+), 42 deletions(-) diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index b526344be2..8e27b835b2 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -20,6 +20,12 @@ makefile.unx.in distrib/msw/*.rsp distrib/msw/*.bat distrib/msw/tardist +distrib/msw/tmake/*.t +distrib/msw/tmake/Makefile +distrib/msw/tmake/filelist.txt +distrib/msw/tmake/makeall.bat +distrib/msw/tmake/makeall.sh +distrib/msw/tmake/wxwin.pro distrib/gtk/* locale/*.po @@ -37,6 +43,7 @@ docs/bugs.txt docs/*.htm docs/html/*.htm docs/html/*.gif +docs/html/*.png src/*.inc src/mkdir @@ -66,6 +73,7 @@ src/html/*.h src/html/bitmaps/*.xpm src/unix/*.cpp +src/unix/*.c src/png/*.c src/png/*.h @@ -97,6 +105,7 @@ include/wx/protocol/*.h include/wx/wx_setup.vms include/wx/common/*.h include/wx/generic/*.h +include/wx/generic/*.xpm include/wx/unix/*.h include/wx/html/*.h include/wx/html/msw/*.bmp diff --git a/distrib/msw/glcanvas.rsp b/distrib/msw/glcanvas.rsp index 3269bf0ae8..12a4744fa4 100644 --- a/distrib/msw/glcanvas.rsp +++ b/distrib/msw/glcanvas.rsp @@ -1,3 +1,4 @@ +utils/glcanvas/Makefile.in utils/glcanvas/docs/*.* utils/glcanvas/win/*.cpp utils/glcanvas/win/*.h diff --git a/distrib/msw/gtk.rsp b/distrib/msw/gtk.rsp index 584c874cf0..ff416c8c37 100644 --- a/distrib/msw/gtk.rsp +++ b/distrib/msw/gtk.rsp @@ -1,3 +1,5 @@ +configure + distrib/gtk/copy_src distrib/gtk/README.txt distrib/gtk/Setup @@ -8,6 +10,7 @@ docs/gtk/COPYING.LIB docs/gtk/makewxgtk include/wx/gtk/*.h +include/wx/gtk/*.xpm include/install-sh include/wx/install-sh diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index b3c072fcb9..ece5e143ce 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -1,3 +1,4 @@ +Makefile.in src/Makefile locale/Makefile samples/Makefile.in diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp index 2934178616..db7b08d23d 100644 --- a/distrib/msw/msw.rsp +++ b/distrib/msw/msw.rsp @@ -5,7 +5,6 @@ docs/wine/COPYING.LIB distrib/msw/*.rsp distrib/msw/*.bat -distrib/msw/tmake/*.t tools/gettext/xgettext.exe tools/gettext/msgfmt.exe diff --git a/distrib/msw/ogl.rsp b/distrib/msw/ogl.rsp index 72d552d4f0..8a742c2744 100644 --- a/distrib/msw/ogl.rsp +++ b/distrib/msw/ogl.rsp @@ -1,3 +1,4 @@ +utils/ogl/Makefile.in utils/ogl/Makefile utils/ogl/src/*.cpp diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 032ad9eac7..8ff4498910 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -12,6 +12,10 @@ #ifndef _WX_NET_H #define _WX_NET_H +#ifdef __GNUG__ + #pragma interface "dialup.h" +#endif + #if wxUSE_DIALUP_MANAGER // ---------------------------------------------------------------------------- diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h index 68bdd47de5..6bf25dff3e 100644 --- a/include/wx/generic/helphtml.h +++ b/include/wx/generic/helphtml.h @@ -120,18 +120,18 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase) virtual bool DisplayHelp(wxString const &) = 0; /// Allows one to override the default settings for the help frame. - virtual void SetFrameParameters(const wxString &title, - const wxSize &size, - const wxPoint &pos = wxDefaultPosition, - bool newFrameEachTime = FALSE) + virtual void SetFrameParameters(const wxString& WXUNUSED(title), + const wxSize& WXUNUSED(size), + const wxPoint& WXUNUSED(pos) = wxDefaultPosition, + bool WXUNUSED(newFrameEachTime) = FALSE) { // does nothing by default } /// Obtains the latest settings used by the help frame and the help /// frame. - virtual wxFrame *GetFrameParameters(wxSize *size = NULL, - wxPoint *pos = NULL, - bool *newFrameEachTime = NULL) + virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL, + wxPoint *WXUNUSED(pos) = NULL, + bool *WXUNUSED(newFrameEachTime) = NULL) { return (wxFrame*) NULL;// does nothing by default } diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h index 3ef8f7e1f9..9479573ecb 100644 --- a/include/wx/helpbase.h +++ b/include/wx/helpbase.h @@ -40,7 +40,7 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject // server is only required when implementing TCP/IP-based // help controllers. virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; } - virtual bool Initialize(const wxString& file) { return FALSE; } + virtual bool Initialize(const wxString& WXUNUSED(file)) { return FALSE; } // Set viewer: only relevant to some kinds of controller virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {} @@ -52,18 +52,18 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject virtual bool DisplayBlock(long blockNo) = 0; virtual bool KeywordSearch(const wxString& k) = 0; /// Allows one to override the default settings for the help frame. - virtual void SetFrameParameters(const wxString &title, - const wxSize &size, - const wxPoint &pos = wxDefaultPosition, - bool newFrameEachTime = FALSE) + virtual void SetFrameParameters(const wxString& WXUNUSED(title), + const wxSize& WXUNUSED(size), + const wxPoint& WXUNUSED(pos) = wxDefaultPosition, + bool WXUNUSED(newFrameEachTime) = FALSE) { // does nothing by default } /// Obtains the latest settings used by the help frame and the help /// frame. - virtual wxFrame *GetFrameParameters(wxSize *size = NULL, - wxPoint *pos = NULL, - bool *newFrameEachTime = NULL) + virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL, + wxPoint *WXUNUSED(pos) = NULL, + bool *WXUNUSED(newFrameEachTime) = NULL) { return (wxFrame*) NULL;// does nothing by default } diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 57a8cf3cc7..f7a0726e42 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -60,12 +60,12 @@ wxFont& wxFont::operator=(const wxFont& font) // VZ: is it correct to compare pointers and not the contents? (FIXME) bool wxFontBase::operator==(const wxFont& font) const { - return m_refData == font.m_refData; + return GetFontData() == font.GetFontData(); } bool wxFontBase::operator!=(const wxFont& font) const { - return m_refData != font.m_refData; + return GetFontData() != font.GetFontData(); } wxString wxFontBase::GetFamilyString() const diff --git a/src/common/image.cpp b/src/common/image.cpp index ab36e52be6..e7d5fc7eae 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -642,7 +642,7 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSE return FALSE; } -bool wxImageHandler::CanRead( wxInputStream& stream ) +bool wxImageHandler::CanRead( wxInputStream& WXUNUSED(stream) ) { return FALSE; } diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index 2c29b90489..20dd5ff749 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -36,7 +36,7 @@ // PCX decoding //----------------------------------------------------------------------------- -void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s) +void RLEencode(unsigned char *WXUNUSED(p), unsigned int WXUNUSED(size), wxOutputStream& WXUNUSED(s)) { } @@ -255,7 +255,7 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose return TRUE; } -bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) +bool wxPCXHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool verbose ) { if (verbose) wxLogError(_T("wxPCXHandler::SaveFile still not implemented")); diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 5c7ba37d3f..7fdb36e3b8 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -677,7 +677,7 @@ size_t wxCountingOutputStream::GetSize() const return m_lastcount; } -size_t wxCountingOutputStream::OnSysWrite(const void *buffer, size_t size) +size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer), size_t size) { m_currentPos += size; if (m_currentPos > m_lastcount) m_lastcount = m_currentPos; diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index f8d23ba8ef..fb4ea8ab41 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -817,7 +817,7 @@ void wxFileDialog::HandleAction( const wxString &fn ) wxDialog::OnOK(event); } -void wxFileDialog::OnListOk( wxCommandEvent &event ) +void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) ) { HandleAction( m_text->GetValue() ); } @@ -881,7 +881,7 @@ wxString wxFileSelectorEx(const wxChar *message, const wxChar *default_path, const wxChar *default_filename, - int *indexDefaultExtension, + int *WXUNUSED(indexDefaultExtension), const wxChar *wildcard, int flags, wxWindow *parent, diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp index 1fdb91028c..dc7f167a13 100644 --- a/src/generic/helpwxht.cpp +++ b/src/generic/helpwxht.cpp @@ -220,7 +220,7 @@ wxHelpFrame::~wxHelpFrame() } void -wxHelpFrame::OnClose(wxCloseEvent &ev) +wxHelpFrame::OnClose(wxCloseEvent &WXUNUSED(ev)) { wxASSERT(m_controller); m_controller->m_Frame = NULL; diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index c3085720e5..0714d5910f 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -90,7 +90,7 @@ wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl) m_pTextCtrl = pTextCtrl; } -void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t t) +void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { wxString msg; TimeStamp(&msg); diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index 1e87427cd7..3af8442a63 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -433,7 +433,7 @@ size_t wxBitmapDataObject::GetSize() const return m_pngSize; } -void wxBitmapDataObject::WriteBitmap( const wxBitmap &bitmap, void *dest ) const +void wxBitmapDataObject::WriteBitmap( const wxBitmap &WXUNUSED(bitmap), void *dest ) const { // if (m_bitmap == bitmap) memcpy( dest, m_pngData, m_pngSize ); diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 958d7db270..ec3b8427b2 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -150,7 +150,7 @@ void wxFont::Init() wxTheFontList->Append( this ); } -wxFont::wxFont( GdkFont *font, char *xFontName ) +wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName ) { if (!xFontName) return; diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 6634bc3243..163c546614 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -100,7 +100,7 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog) -wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data ) +wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *WXUNUSED(data) ) { m_needParent = FALSE; diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 20ea85ac9f..07944b9b68 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -137,7 +137,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge // "child_detached" of tool bar //----------------------------------------------------------------------------- -static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win ) +static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -191,7 +191,7 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *ev so we do this directly after realization */ static gint -gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) +gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index 1be26bfcd7..784dc97f73 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -49,7 +49,7 @@ extern wxList wxPendingDelete; static void gtk_mdi_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), - gint page, + gint WXUNUSED(page), wxMDIParentFrame *parent ) { if (g_isIdle) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index ade2fa716a..dd4d3e4b9e 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1648,7 +1648,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), // "button_release_event" from scrollbar //----------------------------------------------------------------------------- -static gint gtk_scrollbar_button_release_callback( GtkRange *widget, +static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), GdkEventButton *WXUNUSED(gdk_event), wxWindow *win ) { diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 1e87427cd7..3af8442a63 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -433,7 +433,7 @@ size_t wxBitmapDataObject::GetSize() const return m_pngSize; } -void wxBitmapDataObject::WriteBitmap( const wxBitmap &bitmap, void *dest ) const +void wxBitmapDataObject::WriteBitmap( const wxBitmap &WXUNUSED(bitmap), void *dest ) const { // if (m_bitmap == bitmap) memcpy( dest, m_pngData, m_pngSize ); diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index 958d7db270..ec3b8427b2 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -150,7 +150,7 @@ void wxFont::Init() wxTheFontList->Append( this ); } -wxFont::wxFont( GdkFont *font, char *xFontName ) +wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName ) { if (!xFontName) return; diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index 6634bc3243..163c546614 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -100,7 +100,7 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog) -wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data ) +wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *WXUNUSED(data) ) { m_needParent = FALSE; diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 20ea85ac9f..07944b9b68 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -137,7 +137,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge // "child_detached" of tool bar //----------------------------------------------------------------------------- -static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win ) +static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -191,7 +191,7 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *ev so we do this directly after realization */ static gint -gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) +gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 1be26bfcd7..784dc97f73 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -49,7 +49,7 @@ extern wxList wxPendingDelete; static void gtk_mdi_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), - gint page, + gint WXUNUSED(page), wxMDIParentFrame *parent ) { if (g_isIdle) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index ade2fa716a..dd4d3e4b9e 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1648,7 +1648,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), // "button_release_event" from scrollbar //----------------------------------------------------------------------------- -static gint gtk_scrollbar_button_release_callback( GtkRange *widget, +static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), GdkEventButton *WXUNUSED(gdk_event), wxWindow *win ) { diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp index ddafb960fd..85de4fa167 100644 --- a/src/unix/dialup.cpp +++ b/src/unix/dialup.cpp @@ -13,6 +13,10 @@ #if wxUSE_DIALUP_MANAGER +#ifdef __GNUG__ + #pragma implementation "dialup.h" +#endif + #ifndef WX_PRECOMP # include "wx/defs.h" #endif // !PCH @@ -214,7 +218,7 @@ public: { m_DupMan = dupman; } - void OnTerminate(int pid, int status) const + void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) const { m_DupMan->m_DialProcess = NULL; m_DupMan->CheckStatus(TRUE); @@ -485,7 +489,7 @@ wxDialUpManagerImpl::CheckStatusInternal(void) /* static */ wxDialUpManager * -wxDialUpManager::wxDialUpManager::Create(void) +wxDialUpManager::Create(void) { return new wxDialUpManagerImpl; } -- 2.47.2