Suppressed warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -72,9 +72,7 @@ LIB_CPP_SRC=\
|
|||||||
motif/brush.cpp \
|
motif/brush.cpp \
|
||||||
motif/button.cpp \
|
motif/button.cpp \
|
||||||
motif/checkbox.cpp \
|
motif/checkbox.cpp \
|
||||||
motif/chcklst.cpp \
|
|
||||||
motif/choice.cpp \
|
motif/choice.cpp \
|
||||||
motif/clipbrd.cpp \
|
|
||||||
motif/colordlg.cpp \
|
motif/colordlg.cpp \
|
||||||
motif/colour.cpp \
|
motif/colour.cpp \
|
||||||
motif/control.cpp \
|
motif/control.cpp \
|
||||||
@@ -85,8 +83,6 @@ LIB_CPP_SRC=\
|
|||||||
motif/dcclient.cpp \
|
motif/dcclient.cpp \
|
||||||
motif/dcmemory.cpp \
|
motif/dcmemory.cpp \
|
||||||
motif/dcscreen.cpp \
|
motif/dcscreen.cpp \
|
||||||
motif/dnd.cpp \
|
|
||||||
motif/dirdlg.cpp \
|
|
||||||
motif/dialog.cpp \
|
motif/dialog.cpp \
|
||||||
motif/filedlg.cpp \
|
motif/filedlg.cpp \
|
||||||
motif/font.cpp \
|
motif/font.cpp \
|
||||||
|
@@ -397,7 +397,7 @@ wxMask::~wxMask()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create a mask from a mono bitmap (copies the bitmap).
|
// Create a mask from a mono bitmap (copies the bitmap).
|
||||||
bool wxMask::Create(const wxBitmap& bitmap)
|
bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap))
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -405,7 +405,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
|
|||||||
|
|
||||||
// Create a mask from a bitmap and a palette index indicating
|
// Create a mask from a bitmap and a palette index indicating
|
||||||
// the transparent area
|
// the transparent area
|
||||||
bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
|
bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex))
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -413,7 +413,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
|
|||||||
|
|
||||||
// Create a mask from a bitmap and a colour indicating
|
// Create a mask from a bitmap and a colour indicating
|
||||||
// the transparent area
|
// the transparent area
|
||||||
bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
|
bool wxMask::Create(const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour))
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -425,18 +425,20 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
|
|||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
|
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;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long type,
|
bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), long WXUNUSED(type),
|
||||||
int desiredWidth, int desiredHeight)
|
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
|
||||||
{
|
{
|
||||||
return FALSE;
|
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;
|
return FALSE;
|
||||||
}
|
}
|
||||||
@@ -461,8 +463,8 @@ public:
|
|||||||
};
|
};
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxXBMFileHandler, wxBitmapHandler)
|
IMPLEMENT_DYNAMIC_CLASS(wxXBMFileHandler, wxBitmapHandler)
|
||||||
|
|
||||||
bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
|
bool wxXBMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
|
||||||
int desiredWidth, int desiredHeight)
|
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
|
||||||
{
|
{
|
||||||
M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
|
M_BITMAPHANDLERDATA->m_freePixmap = TRUE;
|
||||||
|
|
||||||
@@ -508,7 +510,8 @@ public:
|
|||||||
};
|
};
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
|
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_width = width;
|
||||||
M_BITMAPHANDLERDATA->m_height = height;
|
M_BITMAPHANDLERDATA->m_height = height;
|
||||||
@@ -594,8 +597,8 @@ public:
|
|||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
|
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
|
||||||
|
|
||||||
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
|
bool wxXPMFileHandler::LoadFile( wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags),
|
||||||
int desiredWidth, int desiredHeight)
|
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight) )
|
||||||
{
|
{
|
||||||
Display *dpy = (Display*) wxGetDisplay();
|
Display *dpy = (Display*) wxGetDisplay();
|
||||||
M_BITMAPHANDLERDATA->m_display = (WXDisplay*) dpy;
|
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)
|
if (M_BITMAPHANDLERDATA->m_ok && M_BITMAPHANDLERDATA->m_pixmap)
|
||||||
{
|
{
|
||||||
@@ -689,7 +693,8 @@ public:
|
|||||||
};
|
};
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
|
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_width = width;
|
||||||
M_BITMAPHANDLERDATA->m_height = height;
|
M_BITMAPHANDLERDATA->m_height = height;
|
||||||
|
@@ -56,10 +56,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
|
|||||||
m_marginX = 0;
|
m_marginX = 0;
|
||||||
m_marginY = 0;
|
m_marginY = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
int x = pos.x;
|
int x = pos.x;
|
||||||
int y = pos.y;
|
int y = pos.y;
|
||||||
int width = size.x;
|
int width = size.x;
|
||||||
int height = size.y;
|
int height = size.y;
|
||||||
|
*/
|
||||||
|
|
||||||
if (id == -1)
|
if (id == -1)
|
||||||
m_windowId = NewControlId();
|
m_windowId = NewControlId();
|
||||||
|
@@ -124,7 +124,7 @@ void wxButton::Command (wxCommandEvent & event)
|
|||||||
ProcessCommand (event);
|
ProcessCommand (event);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr)
|
void wxButtonCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
|
||||||
{
|
{
|
||||||
if (!wxGetWindowFromTable(w))
|
if (!wxGetWindowFromTable(w))
|
||||||
// Widget has been deleted!
|
// Widget has been deleted!
|
||||||
|
@@ -84,7 +84,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
|
|||||||
*/
|
*/
|
||||||
m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget, "choiceMenu", NULL, 0);
|
m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget, "choiceMenu", NULL, 0);
|
||||||
|
|
||||||
int i;
|
// int i;
|
||||||
if (n > 0)
|
if (n > 0)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@@ -207,7 +207,7 @@ void wxChoice::Append(const wxString& item)
|
|||||||
m_noStrings ++;
|
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? :-)" );
|
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);
|
ProcessCommand (event);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxChoiceCallback (Widget w, XtPointer clientData,
|
void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
|
||||||
XtPointer ptr)
|
|
||||||
{
|
{
|
||||||
wxChoice *item = (wxChoice *) clientData;
|
wxChoice *item = (wxChoice *) clientData;
|
||||||
if (item)
|
if (item)
|
||||||
|
@@ -131,7 +131,7 @@ void wxComboBox::Paste()
|
|||||||
XmComboBoxPaste((Widget) m_mainWidget);
|
XmComboBoxPaste((Widget) m_mainWidget);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxComboBox::SetEditable(bool editable)
|
void wxComboBox::SetEditable(bool WXUNUSED(editable))
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
@@ -176,7 +176,7 @@ void wxComboBox::SetSelection(long from, long to)
|
|||||||
(Time) 0);
|
(Time) 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxComboBoxCallback (Widget w, XtPointer clientData,
|
void wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
|
||||||
XmComboBoxSelectionCallbackStruct * cbs)
|
XmComboBoxSelectionCallbackStruct * cbs)
|
||||||
{
|
{
|
||||||
wxComboBox *item = (wxComboBox *) clientData;
|
wxComboBox *item = (wxComboBox *) clientData;
|
||||||
|
@@ -428,7 +428,7 @@ WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Global cursor setting
|
// Global cursor setting
|
||||||
void wxSetCursor(const wxCursor& cursor)
|
void wxSetCursor(const wxCursor& WXUNUSED(cursor))
|
||||||
{
|
{
|
||||||
// Nothing to do for Motif (no global cursor)
|
// Nothing to do for Motif (no global cursor)
|
||||||
}
|
}
|
||||||
|
@@ -521,7 +521,7 @@ void wxDialog::EndModal(int retCode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Standard buttons
|
// Standard buttons
|
||||||
void wxDialog::OnOK(wxCommandEvent& event)
|
void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
if ( Validate() && TransferDataFromWindow() )
|
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())
|
if (Validate())
|
||||||
TransferDataFromWindow();
|
TransferDataFromWindow();
|
||||||
// TODO probably need to disable the Apply button until things change again
|
// 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() )
|
if ( IsModal() )
|
||||||
EndModal(wxID_CANCEL);
|
EndModal(wxID_CANCEL);
|
||||||
@@ -592,7 +592,7 @@ bool wxDialog::Destroy()
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
|
void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
|
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
|
||||||
Refresh();
|
Refresh();
|
||||||
@@ -603,7 +603,8 @@ void wxDialog::Fit()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle a close event from the window manager
|
// 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;
|
wxDialog *dialog = (wxDialog *)client_data;
|
||||||
wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, dialog->GetId());
|
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.
|
// TODO: Preferably, we should have a universal repaint proc.
|
||||||
// Meanwhile, use a special one for dialogs.
|
// 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;
|
Window window;
|
||||||
static XRectangle *xrect;
|
|
||||||
Display *display;
|
Display *display;
|
||||||
|
/*
|
||||||
|
static XRectangle *xrect;
|
||||||
GC gc;
|
GC gc;
|
||||||
int llp = 0;
|
int llp = 0;
|
||||||
static int last_count = 0;
|
static int last_count = 0;
|
||||||
static int draw_count = 0;
|
static int draw_count = 0;
|
||||||
|
*/
|
||||||
|
|
||||||
wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w);
|
wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w);
|
||||||
if (!win)
|
if (!win)
|
||||||
@@ -696,7 +699,7 @@ static void wxDialogBoxRepaintProc(Widget w, XtPointer c_data, XEvent *event, ch
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void wxDialogBoxEventHandler (Widget wid,
|
static void wxDialogBoxEventHandler (Widget wid,
|
||||||
XtPointer client_data,
|
XtPointer WXUNUSED(client_data),
|
||||||
XEvent* event,
|
XEvent* event,
|
||||||
Boolean *continueToDispatch)
|
Boolean *continueToDispatch)
|
||||||
{
|
{
|
||||||
@@ -738,7 +741,7 @@ static void wxDialogBoxEventHandler (Widget wid,
|
|||||||
*continueToDispatch = True;
|
*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
|
/* This gets called when the dialog is being shown, which
|
||||||
* defeats modal showing.
|
* 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
|
// TODO
|
||||||
}
|
}
|
||||||
|
@@ -107,13 +107,14 @@ char *wxFileSelectorEx(const char *title,
|
|||||||
wxString wxFileDialog::m_fileSelectorAnswer = "";
|
wxString wxFileDialog::m_fileSelectorAnswer = "";
|
||||||
bool wxFileDialog::m_fileSelectorReturned = FALSE;
|
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_fileSelectorAnswer = "";
|
||||||
wxFileDialog::m_fileSelectorReturned = TRUE;
|
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;
|
char *filename = NULL;
|
||||||
if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {
|
if (!XmStringGetLtoR(cbs->value, XmSTRING_DEFAULT_CHARSET, &filename)) {
|
||||||
@@ -147,7 +148,7 @@ int wxFileDialog::ShowModal()
|
|||||||
{
|
{
|
||||||
wxBeginBusyCursor();
|
wxBeginBusyCursor();
|
||||||
|
|
||||||
static char fileBuf[512];
|
// static char fileBuf[512];
|
||||||
Widget parentWidget = (Widget) 0;
|
Widget parentWidget = (Widget) 0;
|
||||||
if (m_parent)
|
if (m_parent)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user