unused parameter warning fixes for --disable-all-features build

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 8e771902ba1f6750310a03a8e716a93505d26c4e..5621cbc6a978991b91aa58ef451a9829a013d54d 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -192,7 +192,9 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags)
     {
         sizer = CreateStdDialogButtonSizer(flags);
     }
     {
         sizer = CreateStdDialogButtonSizer(flags);
     }

-#endif // wxUSE_BUTTON
+#else // !wxUSE_BUTTON
+    wxUnusedVar(flags);
+#endif // wxUSE_BUTTON/!wxUSE_BUTTON

 
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 
 
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index e93d1010e12b31a5be69debf8c061ad67e021e64..38ad2f2c38049a072983ee15d0c245ffbd7c50c8 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -133,6 +133,8 @@ bool wxFrameBase::IsOneOfBars(const wxWindow *win) const
         return true;
 #endif // wxUSE_TOOLBAR
 
         return true;
 #endif // wxUSE_TOOLBAR
 

+    wxUnusedVar(win);
+

     return false;
 }
 
     return false;
 }
 


@@ -212,6 +214,8 @@ bool wxFrameBase::ProcessCommand(int id)
     GetEventHandler()->ProcessEvent(commandEvent);
     return true;
 #else // !wxUSE_MENUS
     GetEventHandler()->ProcessEvent(commandEvent);
     return true;
 #else // !wxUSE_MENUS

+    wxUnusedVar(id);
+

     return false;
 #endif // wxUSE_MENUS/!wxUSE_MENUS
 }
     return false;
 #endif // wxUSE_MENUS/!wxUSE_MENUS
 }

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2183825135b782f0c0c035dfcc387e4141518aa2..09e92fc0add4a03c1dd70d2ddb5708697c6822a4 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1242,13 +1242,19 @@ wxFindWindowByName (const wxString& name, wxWindow * parent)
 
 // Returns menu item id or wxNOT_FOUND if none.
 int
 
 // Returns menu item id or wxNOT_FOUND if none.
 int

-wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
+wxFindMenuItemId(wxFrame *frame,
+                 const wxString& menuString,
+                 const wxString& itemString)

 {
 #if wxUSE_MENUS
     wxMenuBar *menuBar = frame->GetMenuBar ();
     if ( menuBar )
         return menuBar->FindMenuItem (menuString, itemString);
 {
 #if wxUSE_MENUS
     wxMenuBar *menuBar = frame->GetMenuBar ();
     if ( menuBar )
         return menuBar->FindMenuItem (menuString, itemString);

-#endif // wxUSE_MENUS
+#else // !wxUSE_MENUS
+    wxUnusedVar(frame);
+    wxUnusedVar(menuString);
+    wxUnusedVar(itemString);
+#endif // wxUSE_MENUS/!wxUSE_MENUS

 
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index e5f2b669d15636cd21817378bbd05095efeac93d..663c9ec721a9bc1f6304409c6ca1db8e4f693f61 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -701,6 +701,9 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
     wxImage image = ConvertToImage();
     return image.Ok() && image.SaveFile(name, type);
 #else // !wxUSE_IMAGE
     wxImage image = ConvertToImage();
     return image.Ok() && image.SaveFile(name, type);
 #else // !wxUSE_IMAGE

+    wxUnusedVar(name);
+    wxUnusedVar(type);
+

     return false;
 #endif // wxUSE_IMAGE
 }
     return false;
 #endif // wxUSE_IMAGE
 }

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index ff4289883bec3aeb98122d005ef3d81b8a13d741..200eafb460ec00eaa7faca3f2d8bfe74622ae7a2 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -469,6 +469,11 @@ bool wxGTKWindowImplDC::DoFloodFill(wxCoord x, wxCoord y,
 
     return wxDoFloodFill( GetOwner(), x, y, col, style);
 #else
 
     return wxDoFloodFill( GetOwner(), x, y, col, style);
 #else

+    wxUnusedVar(x);
+    wxUnusedVar(y);
+    wxUnusedVar(col);
+    wxUnusedVar(style);
+

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -488,6 +493,10 @@ bool wxGTKWindowImplDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) cons
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return true;
 #else // !wxUSE_IMAGE
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return true;
 #else // !wxUSE_IMAGE

+    wxUnusedVar(x1);
+    wxUnusedVar(y1);
+    wxUnusedVar(col);
+

     return false;
 #endif // wxUSE_IMAGE/!wxUSE_IMAGE
 }
     return false;
 #endif // wxUSE_IMAGE/!wxUSE_IMAGE
 }


@@ -1736,7 +1745,12 @@ void wxGTKWindowImplDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCo
     // update the bounding box
     CalcBoundingBox(x + minX, y + minY);
     CalcBoundingBox(x + maxX, y + maxY);
     // update the bounding box
     CalcBoundingBox(x + minX, y + minY);
     CalcBoundingBox(x + maxX, y + maxY);

-#endif // wxUSE_IMAGE
+#else // !wxUSE_IMAGE
+    wxUnusedVar(text);
+    wxUnusedVar(x);
+    wxUnusedVar(y);
+    wxUnusedVar(angle);
+#endif // wxUSE_IMAGE/!wxUSE_IMAGE

 }
 
 void wxGTKWindowImplDC::DoGetTextExtent(const wxString &string,
 }
 
 void wxGTKWindowImplDC::DoGetTextExtent(const wxString &string,

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 7275663fe2565133f3cddd1b9c4a57a72e80a8d2..713510290d2ab769d75c787446d1b32bba0fd829 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -316,9 +316,11 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 
     description = pango_font_description_from_string(wxPANGO_CONV(str));
 
 
     description = pango_font_description_from_string(wxPANGO_CONV(str));
 

+#if wxUSE_FONTENUM

     // ensure a valid facename is selected
     if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
         SetFaceName(wxNORMAL_FONT->GetFaceName());
     // ensure a valid facename is selected
     if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
         SetFaceName(wxNORMAL_FONT->GetFaceName());

+#endif // wxUSE_FONTENUM

 
     return true;
 }
 
     return true;
 }