AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Suppressed warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1998-11-09 06:15:41 +00:00
parent 3dd4e4e05c
commit f9e02ac76b
9 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/motif.inc
View File

@ -72,9 +72,7 @@ LIB_CPP_SRC=\
motif/brush.cpp \
motif/button.cpp \
motif/checkbox.cpp \
motif/chcklst.cpp \
motif/choice.cpp \
motif/clipbrd.cpp \
motif/colordlg.cpp \
motif/colour.cpp \
motif/control.cpp \
@ -85,8 +83,6 @@ LIB_CPP_SRC=\
motif/dcclient.cpp \
motif/dcmemory.cpp \
motif/dcscreen.cpp \
motif/dnd.cpp \
motif/dirdlg.cpp \
motif/dialog.cpp \
motif/filedlg.cpp \
motif/font.cpp \

33
src/motif/bitmap.cpp
View File

@ -397,7 +397,7 @@ wxMask::~wxMask()
}
// Create a mask from a mono bitmap (copies the bitmap).
bool wxMask::Create(const wxBitmap& bitmap)
bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap))
{
// TODO
return FALSE;
@ -405,7 +405,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
// Create a mask from a bitmap and a palette index indicating
// the transparent area
bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex))
{
// TODO
return FALSE;
@ -413,7 +413,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
// Create a mask from a bitmap and a colour indicating
// the transparent area
bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour))
{
// TODO
return FALSE;
@ -425,18 +425,20 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), void *WXUNUSED(data), long WXUNUSED(type),
int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
{
return FALSE;
}
bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type,
int desiredWidth, int desiredHeight)
bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type),
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
{
return FALSE;
}
bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), int WXUNUSED(type),
const wxPalette *WXUNUSED(palette))
{
return FALSE;
}
@ -461,8 +463,8 @@ public:
};
IMPLEMENT_DYNAMIC_CLASS(wxXBMFileHandler, wxBitmapHandler)
bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
{
M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
@ -508,7 +510,8 @@ public:
};
IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
bool wxXBMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *data, long WXUNUSED(flags),
int width, int height, int WXUNUSED(depth))
{
M_BITMAPHANDLERDATA->m_width = width;
M_BITMAPHANDLERDATA->m_height = height;
@ -594,8 +597,8 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
bool wxXPMFileHandler::LoadFile( wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight) )
{
Display *dpy = (Display*) wxGetDisplay();
M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
@ -656,7 +659,8 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
}
}
bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
bool wxXPMFileHandler::SaveFile( wxBitmap *bitmap, const wxString& name, int WXUNUSED(type),
const wxPalette *WXUNUSED(palette))
{
if (M_BITMAPHANDLERDATA->m_ok && M_BITMAPHANDLERDATA->m_pixmap)
{
@ -689,7 +693,8 @@ public:
};
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
bool wxXPMDataHandler::Create( wxBitmap *bitmap, void *data, long WXUNUSED(flags),
int width, int height, int WXUNUSED(depth))
{
M_BITMAPHANDLERDATA->m_width = width;
M_BITMAPHANDLERDATA->m_height = height;

2
src/motif/bmpbuttn.cpp
View File

@ -56,10 +56,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
m_marginX = 0;
m_marginY = 0;
/*
int x = pos.x;
int y = pos.y;
int width = size.x;
int height = size.y;
*/
if (id == -1)
m_windowId = NewControlId();

2
src/motif/button.cpp
View File

@ -124,7 +124,7 @@ void wxButton::Command (wxCommandEvent & event)
ProcessCommand (event);
}
void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr)
void wxButtonCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
{
if (!wxGetWindowFromTable(w))
// Widget has been deleted!

7
src/motif/choice.cpp
View File

@ -84,7 +84,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
*/
m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget, "choiceMenu", NULL, 0);
int i;
// int i;
if (n > 0)
{
int i;
@ -207,7 +207,7 @@ void wxChoice::Append(const wxString& item)
m_noStrings ++;
}
void wxChoice::Delete(int n)
void wxChoice::Delete(int WXUNUSED(n))
{
wxFAIL_MSG( "Sorry, wxChoice::Delete isn't implemented yet. Maybe you'd like to volunteer? :-)" );
@ -404,8 +404,7 @@ void wxChoice::Command(wxCommandEvent & event)
ProcessCommand (event);
}
void wxChoiceCallback (Widget w, XtPointer clientData,
XtPointer ptr)
void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
{
wxChoice *item = (wxChoice *) clientData;
if (item)

4
src/motif/combobox.cpp
View File

@ -131,7 +131,7 @@ void wxComboBox::Paste()
XmComboBoxPaste((Widget) m_mainWidget);
}
void wxComboBox::SetEditable(bool editable)
void wxComboBox::SetEditable(bool WXUNUSED(editable))
{
// TODO
}
@ -176,7 +176,7 @@ void wxComboBox::SetSelection(long from, long to)
(Time) 0);
}
void wxComboBoxCallback (Widget w, XtPointer clientData,
void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
XmComboBoxSelectionCallbackStruct * cbs)
{
wxComboBox *item = (wxComboBox *) clientData;

2
src/motif/cursor.cpp
View File

@ -428,7 +428,7 @@ WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id)
}
// Global cursor setting
void wxSetCursor(const wxCursor& cursor)
void wxSetCursor(const wxCursor& WXUNUSED(cursor))
{
// Nothing to do for Motif (no global cursor)
}

23
src/motif/dialog.cpp
View File

@ -521,7 +521,7 @@ void wxDialog::EndModal(int retCode)
}
// Standard buttons
void wxDialog::OnOK(wxCommandEvent& event)
void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{
if ( Validate() && TransferDataFromWindow() )
{
@ -535,14 +535,14 @@ void wxDialog::OnOK(wxCommandEvent& event)
}
}
void wxDialog::OnApply(wxCommandEvent& event)
void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
{
if (Validate())
TransferDataFromWindow();
// TODO probably need to disable the Apply button until things change again
}
void wxDialog::OnCancel(wxCommandEvent& event)
void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
if ( IsModal() )
EndModal(wxID_CANCEL);
@ -592,7 +592,7 @@ bool wxDialog::Destroy()
return TRUE;
}
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
Refresh();
@ -603,7 +603,8 @@ void wxDialog::Fit()
}
// Handle a close event from the window manager
static void wxCloseDialogCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data,
XmAnyCallbackStruct *WXUNUSED(cbs))
{
wxDialog *dialog = (wxDialog *)client_data;
wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, dialog->GetId());
@ -615,15 +616,17 @@ static void wxCloseDialogCallback(Widget widget, XtPointer client_data, XmAnyCal
// TODO: Preferably, we should have a universal repaint proc.
// Meanwhile, use a special one for dialogs.
static void wxDialogBoxRepaintProc(Widget w, XtPointer c_data, XEvent *event, char *)
static void wxDialogBoxRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
{
Window window;
static XRectangle *xrect;
Display *display;
/*
static XRectangle *xrect;
GC gc;
int llp = 0;
static int last_count = 0;
static int draw_count = 0;
*/
wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w);
if (!win)
@ -696,7 +699,7 @@ static void wxDialogBoxRepaintProc(Widget w, XtPointer c_data, XEvent *event, ch
}
static void wxDialogBoxEventHandler (Widget wid,
XtPointer client_data,
XtPointer WXUNUSED(client_data),
XEvent* event,
Boolean *continueToDispatch)
{
@ -738,7 +741,7 @@ static void wxDialogBoxEventHandler (Widget wid,
*continueToDispatch = True;
}
static void wxUnmapBulletinBoard(Widget dialog, wxDialog *client,XtPointer call)
static void wxUnmapBulletinBoard(Widget WXUNUSED(dialog), wxDialog *WXUNUSED(client), XtPointer WXUNUSED(call) )
{
/* This gets called when the dialog is being shown, which
* defeats modal showing.
@ -747,7 +750,7 @@ static void wxUnmapBulletinBoard(Widget dialog, wxDialog *client,XtPointer call)
*/
}
void wxDialog::ChangeFont(bool keepOriginalSize)
void wxDialog::ChangeFont(bool WXUNUSED(keepOriginalSize))
{
// TODO
}

7
src/motif/filedlg.cpp
View File

@ -107,13 +107,14 @@ char *wxFileSelectorEx(const char *title,
wxString wxFileDialog::m_fileSelectorAnswer = "";
bool wxFileDialog::m_fileSelectorReturned = FALSE;
void wxFileSelCancel(Widget fs, XtPointer client_data, XmFileSelectionBoxCallbackStruct *cbs)
void wxFileSelCancel( Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data),
XmFileSelectionBoxCallbackStruct *WXUNUSED(cbs) )
{
wxFileDialog::m_fileSelectorAnswer = "";
wxFileDialog::m_fileSelectorReturned = TRUE;
}
void wxFileSelOk(Widget fs, XtPointer client_data, XmFileSelectionBoxCallbackStruct *cbs)
void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSelectionBoxCallbackStruct *cbs)
{
char *filename = NULL;
if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {
@ -147,7 +148,7 @@ int wxFileDialog::ShowModal()
{
wxBeginBusyCursor();
static char fileBuf[512];
// static char fileBuf[512];
Widget parentWidget = (Widget) 0;
if (m_parent)
{