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

unused parameter warnings suppressed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-09-18 16:49:30 +00:00
parent 1fa609b166
commit 014b0d064e
5 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/prntbase.h
View File

@@ -243,8 +243,8 @@ public:
void OnWindowClose(wxCommandEvent& event); void OnWindowClose(wxCommandEvent& event);
void OnNext(); void OnNext();
void OnPrevious(); void OnPrevious();
void OnNextButton(wxCommandEvent &event) { OnNext(); } void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); }
void OnPreviousButton(wxCommandEvent &event) { OnPrevious(); } void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); }
void OnChar(wxKeyEvent &event); void OnChar(wxKeyEvent &event);
void OnZoom(wxCommandEvent& event); void OnZoom(wxCommandEvent& event);
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);

26
src/gtk/listbox.cpp
View File

@@ -88,7 +88,9 @@ static bool g_hasDoubleClicked = FALSE;
after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */ after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */
static gint static gint
gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
GdkEventButton * WXUNUSED(gdk_event),
wxListBox *listbox )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
@@ -127,7 +129,9 @@ gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_even
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint static gint
gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) gtk_listbox_button_press_callback( GtkWidget *widget,
GdkEventButton *gdk_event,
wxListBox *listbox )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
@@ -151,7 +155,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
listbox->GetEventHandler()->ProcessEvent( event ); listbox->GetEventHandler()->ProcessEvent( event );
} }
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
/* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
@@ -388,7 +392,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
return; return;
} }
wxArrayString deletedLabels; wxArrayString deletedLabels;
wxArrayPtrVoid deletedData; wxArrayPtrVoid deletedData;
wxArrayInt deletedChecks; // only for check list boxes wxArrayInt deletedChecks; // only for check list boxes
@@ -406,7 +410,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
// save data // save data
void *clientData = NULL; void *clientData = NULL;
wxNode *node = NULL; wxNode *node = NULL;
if ( n < (int)m_clientObjectList.GetCount() ) if ( n < (int)m_clientObjectList.GetCount() )
node = m_clientObjectList.Nth( n ); node = m_clientObjectList.Nth( n );
@@ -419,7 +423,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
if ( !clientData ) if ( !clientData )
{ {
if ( n < (int)m_clientDataList.GetCount() ) if ( n < (int)m_clientDataList.GetCount() )
node = m_clientDataList.Nth( n ); node = m_clientDataList.Nth( n );
if ( node ) if ( node )
{ {
@@ -517,7 +521,7 @@ void wxListBox::AppendCommon( const wxString &item )
{ {
gtk_widget_realize( list_item ); gtk_widget_realize( list_item );
gtk_widget_realize( GTK_BIN(list_item)->child ); gtk_widget_realize( GTK_BIN(list_item)->child );
//if (m_widgetStyle) ApplyWidgetStyle(); //if (m_widgetStyle) ApplyWidgetStyle();
if (m_widgetStyle) { if (m_widgetStyle) {
// Apply current widget style to the new list_item // Apply current widget style to the new list_item
@@ -658,7 +662,7 @@ void wxListBox::Deselect( int n )
DisableEvents(); DisableEvents();
gtk_list_unselect_item( m_list, n ); gtk_list_unselect_item( m_list, n );
EnableEvents(); EnableEvents();
} }
@@ -746,7 +750,7 @@ wxString wxListBox::GetString( int n ) const
return str; return str;
} }
wxFAIL_MSG(_T("wrong listbox index")); wxFAIL_MSG(_T("wrong listbox index"));
return _T(""); return _T("");
@@ -824,7 +828,7 @@ void wxListBox::SetSelection( int n, bool select )
gtk_list_select_item( m_list, n ); gtk_list_select_item( m_list, n );
else else
gtk_list_unselect_item( m_list, n ); gtk_list_unselect_item( m_list, n );
EnableEvents(); EnableEvents();
} }
@@ -948,7 +952,7 @@ void wxListBox::EnableEvents()
if (HasFlag(wxLB_MULTIPLE)) if (HasFlag(wxLB_MULTIPLE))
gtk_signal_connect( GTK_OBJECT(child->data), "deselect", gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
child = child->next; child = child->next;
} }
} }

6
src/gtk/window.cpp
View File

@@ -146,7 +146,7 @@ static guint32 gs_timeLastClick = 0;
static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget), static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
const wxChar *name ) const wxChar *WXUNUSED(name) )
{ {
/* /*
static bool s_done = FALSE; static bool s_done = FALSE;
@@ -2268,7 +2268,9 @@ void wxWindow::DoSetClientSize( int width, int height )
if (HasScrolling()) if (HasScrolling())
{ {
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
#if 0 // unused - if this is ok, just remove this line (VZ)
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#endif // 0
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
@@ -2334,7 +2336,9 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
{ {
if (HasScrolling()) if (HasScrolling())
{ {
#if 0 // unused - if this is ok, just remove this line (VZ)
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
#endif // 0
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;

26
src/gtk1/listbox.cpp
View File

@@ -88,7 +88,9 @@ static bool g_hasDoubleClicked = FALSE;
after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */ after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */
static gint static gint
gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
GdkEventButton * WXUNUSED(gdk_event),
wxListBox *listbox )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
@@ -127,7 +129,9 @@ gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_even
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint static gint
gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) gtk_listbox_button_press_callback( GtkWidget *widget,
GdkEventButton *gdk_event,
wxListBox *listbox )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
@@ -151,7 +155,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
listbox->GetEventHandler()->ProcessEvent( event ); listbox->GetEventHandler()->ProcessEvent( event );
} }
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
/* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
@@ -388,7 +392,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
return; return;
} }
wxArrayString deletedLabels; wxArrayString deletedLabels;
wxArrayPtrVoid deletedData; wxArrayPtrVoid deletedData;
wxArrayInt deletedChecks; // only for check list boxes wxArrayInt deletedChecks; // only for check list boxes
@@ -406,7 +410,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
// save data // save data
void *clientData = NULL; void *clientData = NULL;
wxNode *node = NULL; wxNode *node = NULL;
if ( n < (int)m_clientObjectList.GetCount() ) if ( n < (int)m_clientObjectList.GetCount() )
node = m_clientObjectList.Nth( n ); node = m_clientObjectList.Nth( n );
@@ -419,7 +423,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
if ( !clientData ) if ( !clientData )
{ {
if ( n < (int)m_clientDataList.GetCount() ) if ( n < (int)m_clientDataList.GetCount() )
node = m_clientDataList.Nth( n ); node = m_clientDataList.Nth( n );
if ( node ) if ( node )
{ {
@@ -517,7 +521,7 @@ void wxListBox::AppendCommon( const wxString &item )
{ {
gtk_widget_realize( list_item ); gtk_widget_realize( list_item );
gtk_widget_realize( GTK_BIN(list_item)->child ); gtk_widget_realize( GTK_BIN(list_item)->child );
//if (m_widgetStyle) ApplyWidgetStyle(); //if (m_widgetStyle) ApplyWidgetStyle();
if (m_widgetStyle) { if (m_widgetStyle) {
// Apply current widget style to the new list_item // Apply current widget style to the new list_item
@@ -658,7 +662,7 @@ void wxListBox::Deselect( int n )
DisableEvents(); DisableEvents();
gtk_list_unselect_item( m_list, n ); gtk_list_unselect_item( m_list, n );
EnableEvents(); EnableEvents();
} }
@@ -746,7 +750,7 @@ wxString wxListBox::GetString( int n ) const
return str; return str;
} }
wxFAIL_MSG(_T("wrong listbox index")); wxFAIL_MSG(_T("wrong listbox index"));
return _T(""); return _T("");
@@ -824,7 +828,7 @@ void wxListBox::SetSelection( int n, bool select )
gtk_list_select_item( m_list, n ); gtk_list_select_item( m_list, n );
else else
gtk_list_unselect_item( m_list, n ); gtk_list_unselect_item( m_list, n );
EnableEvents(); EnableEvents();
} }
@@ -948,7 +952,7 @@ void wxListBox::EnableEvents()
if (HasFlag(wxLB_MULTIPLE)) if (HasFlag(wxLB_MULTIPLE))
gtk_signal_connect( GTK_OBJECT(child->data), "deselect", gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
child = child->next; child = child->next;
} }
} }

6
src/gtk1/window.cpp
View File

@@ -146,7 +146,7 @@ static guint32 gs_timeLastClick = 0;
static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget), static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
const wxChar *name ) const wxChar *WXUNUSED(name) )
{ {
/* /*
static bool s_done = FALSE; static bool s_done = FALSE;
@@ -2268,7 +2268,9 @@ void wxWindow::DoSetClientSize( int width, int height )
if (HasScrolling()) if (HasScrolling())
{ {
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
#if 0 // unused - if this is ok, just remove this line (VZ)
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
#endif // 0
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;
GtkStyleClass *viewport_class = viewport->style->klass; GtkStyleClass *viewport_class = viewport->style->klass;
@@ -2334,7 +2336,9 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
{ {
if (HasScrolling()) if (HasScrolling())
{ {
#if 0 // unused - if this is ok, just remove this line (VZ)
GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
#endif // 0
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
GtkWidget *viewport = scroll_window->viewport; GtkWidget *viewport = scroll_window->viewport;