Suppressed warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif.inc b/src/motif.inc
index 24a41d4958b3669e29a57903657fe7176d4dffd9..aedd2d20944baac4cc62829420c5fa097a17e30e 100644 (file)
--- a/src/motif.inc
+++ b/src/motif.inc
@@ -72,9 +72,7 @@ LIB_CPP_SRC=\
  motif/brush.cpp \
  motif/button.cpp \
  motif/checkbox.cpp \
  motif/brush.cpp \
  motif/button.cpp \
  motif/checkbox.cpp \

- motif/chcklst.cpp \

  motif/choice.cpp \
  motif/choice.cpp \

- motif/clipbrd.cpp \

  motif/colordlg.cpp \
  motif/colour.cpp \
  motif/control.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/dcclient.cpp \
  motif/dcmemory.cpp \
  motif/dcscreen.cpp \

- motif/dnd.cpp \
- motif/dirdlg.cpp \

  motif/dialog.cpp \
  motif/filedlg.cpp \
  motif/font.cpp \
  motif/dialog.cpp \
  motif/filedlg.cpp \
  motif/font.cpp \

diff --git a/src/motif/bitmap.cpp b/src/motif/bitmap.cpp
index 93eb32f7320e919112cb78182f016d38b60b4a51..78272ccdf008b97c2061681b33efcc33f4b7d8c5 100644 (file)
--- a/src/motif/bitmap.cpp
+++ b/src/motif/bitmap.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
     return FALSE;
 {
 // 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
 
 // 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;
 {
 // 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
 
 // 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;
 {
 // TODO
     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,
-        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;
 }
 
 {
     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,
-          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;
 
 {
     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_height = height;
 {
     M_BITMAPHANDLERDATA->m_width = width;
     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,
-          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;
 {
     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)
     {
 {
     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_height = height;
 {
     M_BITMAPHANDLERDATA->m_width = width;
     M_BITMAPHANDLERDATA->m_height = height;

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 2be27c9439b26ecd34dcebbe3ab7b781cf723f7a..9d30cc7d6c047d38a9cdd119b05f2b4258ca0aa2 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -56,10 +56,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     m_marginX = 0;
     m_marginY = 0;
 
     m_marginX = 0;
     m_marginY = 0;
 

+/*

     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;
     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;

+*/

 
     if (id == -1)
         m_windowId = NewControlId();
 
     if (id == -1)
         m_windowId = NewControlId();

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index c3f5be3ec4287d530eb782280b58d8fffa739b27..6a2a632465c17296306aea5cf36dce7cb26c8419 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -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))
     // Widget has been deleted!
 {
   if (!wxGetWindowFromTable(w))
     // Widget has been deleted!

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 2585d18a6af6e5610f4439b508cdde4fea62c6b1..e21631b19a0edfaf5f363ae602203579aeff8802 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -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)
     {
         int i;
     if (n > 0)
     {
         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,
-          XtPointer ptr)
+void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))

 {
     wxChoice *item = (wxChoice *) clientData;
     if (item)
 {
     wxChoice *item = (wxChoice *) clientData;
     if (item)

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 95d66b984dc8fc0bf83b539d889d9ef400caad9a..8361a2b1023975b3729ac728efb7ec1dccb96eac 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -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)
 {
     wxComboBox *item = (wxComboBox *) clientData;
                   XmComboBoxSelectionCallbackStruct * cbs)
 {
     wxComboBox *item = (wxComboBox *) clientData;

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 829a616a5b24fb1c5d78e7c8a837b8ead0caf057..c1027a775e0049a38b2baaaea17804b46f26cde5 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -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)
 }

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 7edbb5df9132c858f687c4d654d98bca1c6686b4..12f3a7ffad4531837efc1cbb76b7131e86af675b 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -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())
                TransferDataFromWindow();
        // TODO probably need to disable the Apply button until things change again
 }
 
 {
        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);
 {
     if ( IsModal() )
         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));
   Refresh();
 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   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;
   wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, dialog->GetId());
 {
   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.
 
 // 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;
    {
      Window window;

-     static XRectangle *xrect;

      Display *display;
      Display *display;

+/*
+     static XRectangle *xrect;

      GC gc;
      int llp = 0;
      static int last_count = 0;
      static int draw_count = 0;
      GC gc;
      int llp = 0;
      static int last_count = 0;
      static int draw_count = 0;

+*/

 
      wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w);
      if (!win)
 
      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,
    }
 
 static void wxDialogBoxEventHandler (Widget    wid,

-                              XtPointer client_data,
+                              XtPointer WXUNUSED(client_data),

                               XEvent*   event,
                               Boolean *continueToDispatch)
 {
                               XEvent*   event,
                               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
    * defeats modal showing.
 {
   /* 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
 }
 {
     // TODO
 }

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index b94e314e2ff2cf70be01b7d8c78f3cf89b152457..81567f5d87b2ab5b68f8f19984553a8a4d257ead 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -107,13 +107,14 @@ char *wxFileSelectorEx(const char *title,
 wxString wxFileDialog::m_fileSelectorAnswer = "";
 bool wxFileDialog::m_fileSelectorReturned = FALSE;
 
 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;
 }
 
 {
   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)) {
 {
   char *filename = NULL;
   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;
   if (m_parent)
   {
   Widget parentWidget = (Widget) 0;
   if (m_parent)
   {