wxUSE_XXX related fixes

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

include/wx/mac/carbon/dcprint.h

@@ -24,9 +24,9 @@ class wxNativePrinterDC ;
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
+#if wxUSE_PRINTING_ARCHITECTURE
   DECLARE_CLASS(wxPrinterDC)
 
-#if wxUSE_PRINTING_ARCHITECTURE
   // Create a printer DC
   wxPrinterDC(const wxPrintData& printdata );
   ~wxPrinterDC();

include/wx/mac/carbon/tabctrl.h

@@ -16,6 +16,8 @@
 #pragma interface "tabctrl.h"
 #endif
 
+#include "wx/control.h"
+
 class wxImageList;
 
 /*

src/common/cmndata.cpp

@@ -63,11 +63,12 @@
     #endif
 #endif // MSW
 
-#ifdef __WXMAC__
+    #if wxUSE_PRINTING_ARCHITECTURE
+
+#if defined(__WXMAC__)
     #include "wx/mac/private/print.h"
 #endif
 
-    #if wxUSE_PRINTING_ARCHITECTURE
         IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)

src/generic/vlbox.cpp

@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_LISTBOX
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
@@ -623,3 +625,5 @@ wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)
 {
     return wxListBox::GetClassDefaultAttributes(variant);
 }
+
+#endif

src/mac/carbon/app.cpp

@@ -266,19 +266,26 @@ short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 }
 
 
+
 //----------------------------------------------------------------------
 // Support Routines linking the Mac...File Calls to the Document Manager
 //----------------------------------------------------------------------
 
 void wxApp::MacOpenFile(const wxString & fileName )
 {
+#if wxUSE_DOC_VIEW_ARCHITECTURE
     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
         dm->CreateDocument(fileName , wxDOC_SILENT ) ;
+#endif
 }
 
+
 void wxApp::MacPrintFile(const wxString & fileName )
 {
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+
+#if wxUSE_PRINTING_ARCHITECTURE
     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
     {
@@ -303,8 +310,13 @@ void wxApp::MacPrintFile(const wxString & fileName )
             }
         }
     }
+#endif //print
+
+#endif //docview
 }
 
+
+
 void wxApp::MacNewFile()
 {
 }

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) ;

src/mac/carbon/bmpbuttn.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_BMPBUTTON
+
 #include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
@@ -108,3 +110,5 @@ wxSize wxBitmapButton::DoGetBestSize() const
     }
     return best;
 }
+
+#endif

src/mac/carbon/checkbox.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_CHECKBOX
+
 #include "wx/checkbox.h"
 
 #if !USE_SHARED_LIBRARY
@@ -178,4 +180,4 @@ bool wxBitmapCheckBox::GetValue() const
     return FALSE;
 }
 
-
+#endif

src/mac/carbon/clipbrd.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_CLIPBOARD
+
 #include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"
@@ -401,3 +403,5 @@ bool wxClipboard::GetData( wxDataObject& data )
     delete[] array ;
     return transferred ;
 }
+
+#endif

src/mac/carbon/combobox.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_COMBOBOX
+
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"
@@ -645,3 +647,4 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     return noErr ;
 }
 
+#endif

src/mac/carbon/dataobj.cpp

@@ -24,6 +24,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_DATAOBJ
+
 #ifndef WX_PRECOMP
 #include "wx/intl.h"
 #endif
@@ -331,3 +333,5 @@ bool wxBitmapDataObject::SetData(
     
     return m_bitmap.Ok();
 }
+
+#endif

src/mac/carbon/dcprint.cpp

@@ -16,6 +16,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -449,4 +451,4 @@ void wxPrinterDC::DoGetSize(int *width, int *height) const
         * height = m_nativePrinterDC->GetMaxY() ;
 }
 
-
+#endif

src/mac/carbon/dirdlg.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_DIRDLG
+
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/dirdlg.h"
@@ -118,3 +120,4 @@ int wxDirDialog::ShowModal()
     return wxID_CANCEL;
 }
 
+#endif

src/mac/carbon/fontenum.cpp

@@ -24,6 +24,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_FONTMAP
+
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
@@ -171,3 +173,5 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     return TRUE;
 }
+
+#endif

src/mac/carbon/listbox.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_LISTBOX
+
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"
@@ -902,3 +904,5 @@ void wxListBox::OnChar(wxKeyEvent& event)
 
 #endif // !TARGET_API_MAC_OSX
 
+#endif
+

src/mac/carbon/mdi.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_MDI
+
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
@@ -394,3 +396,5 @@ void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {
 }
 
+#endif
+

src/mac/carbon/notebmac.cpp

@@ -22,6 +22,8 @@
 // ----------------------------------------------------------------------------
 #include "wx/wxprec.h"
 
+#if wxUSE_NOTEBOOK
+
 #include "wx/app.h"
 #include "wx/string.h"
 #include "wx/log.h"
@@ -547,3 +549,5 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     return status ;
 }
 
+#endif
+

src/mac/carbon/printdlg.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #include "wx/object.h"
 #include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"
@@ -125,3 +127,5 @@ int wxMacPageSetupDialog::ShowModal()
     return result;
 }
 
+#endif
+

src/mac/carbon/printmac.cpp

@@ -16,6 +16,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
@@ -779,3 +781,5 @@ void wxMacPrintPreview::DetermineScaling(void)
     
     m_previewScale = 1 ;
 }
+
+#endif

src/mac/carbon/radiobox.cpp

@@ -20,6 +20,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_RADIOBOX
+
 #include "wx/arrstr.h"
 
 #include "wx/radiobox.h"
@@ -580,7 +582,7 @@ int wxRadioBox::GetColumnCount() const
     }
 }
 
-
+#endif
 
 
 

src/mac/carbon/radiobut.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_RADIOBTN
+
 #include "wx/radiobut.h"
 
 #if !USE_SHARED_LIBRARY
@@ -154,3 +156,5 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
           return(cycle);
       }
 }  
+
+#endif

src/mac/carbon/statbmp.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_STATBMP
+
 #include "wx/statbmp.h"
 #include "wx/dcclient.h"
 
@@ -81,3 +83,5 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return DoGetSizeFromClientSize( wxSize(16, 16) ); 
 }
 
+#endif
+

src/mac/carbon/statbox.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_STATBOX
+
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"
 
@@ -51,3 +53,5 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
     
     return TRUE;
 }
+
+#endif

src/mac/carbon/toplevel.cpp

@@ -36,6 +36,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
+    #include "wx/control.h"
 #endif //WX_PRECOMP
 
 #include "wx/mac/uma.h"
@@ -449,6 +450,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
                 currentMouseWindow = wxFindControlFromMacControl( control ) ;
                 if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved )
                 {
+#if wxUSE_TOOLBAR
                 	// for wxToolBar to function we have to send certaint events to it
                 	// instead of its children (wxToolBarTools)	
                     ControlRef parent ;
@@ -456,6 +458,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
                     wxWindow *wxParent = wxFindControlFromMacControl( parent ) ;
                     if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) )
                         currentMouseWindow = wxParent ;
+#endif
                 }
             }
         }