wxUSE_XXX related fixes

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

src/mac/carbon/bitmap.cpp

@@ -1025,11 +1025,15 @@ int wxBitmap::GetDepth() const
    return M_BITMAPDATA->GetDepth();
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 int wxBitmap::GetQuality() const
 {
     return 0;
 }
 
+#endif
+
 wxMask *wxBitmap::GetMask() const
 {
    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
@@ -1068,10 +1072,14 @@ void wxBitmap::SetDepth(int d)
     M_BITMAPDATA->SetDepth(d);
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
 void wxBitmap::SetQuality(int WXUNUSED(quality))
 {
 }
 
+#endif
+
 void wxBitmap::SetOk(bool isOk)
 {
     if (!M_BITMAPDATA)
@@ -1299,9 +1307,11 @@ public:
 };
 IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)
 
+
 bool  wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
           int desiredWidth, int desiredHeight)
 {
+#if wxUSE_METAFILE
     Str255 theName ;
     wxMacStringToPascal( name , theName ) ;
 
@@ -1317,9 +1327,11 @@ bool  wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
         dc.SelectObject( wxNullBitmap ) ;
         return TRUE ;
     }
+#endif //wxUSE_METAFILE
     return FALSE ;
 }
 
+
 void wxBitmap::InitStandardHandlers()
 {
     AddHandler(new wxPICTResourceHandler) ;