From 179e085f05fab385b89a18281e115003de890388 Mon Sep 17 00:00:00 2001
From: Ryan Norton <wxprojects@comcast.net>
Date: Fri, 18 Feb 2005 04:43:47 +0000
Subject: [PATCH] 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 | 2 +-
include/wx/mac/carbon/tabctrl.h | 2 ++
src/common/cmndata.cpp | 5 +++--
src/generic/vlbox.cpp | 4 ++++
src/mac/carbon/app.cpp | 12 ++++++++++++
src/mac/carbon/bitmap.cpp | 12 ++++++++++++
src/mac/carbon/bmpbuttn.cpp | 4 ++++
src/mac/carbon/checkbox.cpp | 4 +++-
src/mac/carbon/clipbrd.cpp | 4 ++++
src/mac/carbon/combobox.cpp | 3 +++
src/mac/carbon/dataobj.cpp | 4 ++++
src/mac/carbon/dcprint.cpp | 4 +++-
src/mac/carbon/dirdlg.cpp | 3 +++
src/mac/carbon/fontenum.cpp | 4 ++++
src/mac/carbon/listbox.cpp | 4 ++++
src/mac/carbon/mdi.cpp | 4 ++++
src/mac/carbon/notebmac.cpp | 4 ++++
src/mac/carbon/printdlg.cpp | 4 ++++
src/mac/carbon/printmac.cpp | 4 ++++
src/mac/carbon/radiobox.cpp | 4 +++-
src/mac/carbon/radiobut.cpp | 4 ++++
src/mac/carbon/statbmp.cpp | 4 ++++
src/mac/carbon/statbox.cpp | 4 ++++
src/mac/carbon/toplevel.cpp | 3 +++
24 files changed, 100 insertions(+), 6 deletions(-)
diff --git a/include/wx/mac/carbon/dcprint.h b/include/wx/mac/carbon/dcprint.h
index dfc39d4559..2165191bfd 100644
--- a/include/wx/mac/carbon/dcprint.h
+++ b/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();
diff --git a/include/wx/mac/carbon/tabctrl.h b/include/wx/mac/carbon/tabctrl.h
index 3eedfea99e..dab9e3995d 100644
--- a/include/wx/mac/carbon/tabctrl.h
+++ b/include/wx/mac/carbon/tabctrl.h
@@ -16,6 +16,8 @@
#pragma interface "tabctrl.h"
#endif
+#include "wx/control.h"
+
class wxImageList;
/*
diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 1896239b72..171f85d130 100644
--- a/src/common/cmndata.cpp
+++ b/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)
diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index b7175edf6c..ebe2ad77c2 100644
--- a/src/generic/vlbox.cpp
+++ b/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
\ No newline at end of file
diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index efd5093945..6dc7ffd402 100644
--- a/src/mac/carbon/app.cpp
+++ b/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()
{
}
diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 02788c2c8e..96f0be423e 100644
--- a/src/mac/carbon/bitmap.cpp
+++ b/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) ;
diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index 9d944f40b5..84fb35b64f 100644
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/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
diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index c8f2f6eda4..b8ad8a5169 100644
--- a/src/mac/carbon/checkbox.cpp
+++ b/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
diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index be0973dd38..cda81e29bb 100644
--- a/src/mac/carbon/clipbrd.cpp
+++ b/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
diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 535a468371..110daa1c21 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/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
diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index 33e738e0b9..ae340be2c5 100644
--- a/src/mac/carbon/dataobj.cpp
+++ b/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
\ No newline at end of file
diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index d4f9108987..414680e1d0 100644
--- a/src/mac/carbon/dcprint.cpp
+++ b/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
diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 259eba0f11..96cbb64de2 100644
--- a/src/mac/carbon/dirdlg.cpp
+++ b/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
diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index 9b48a9fbf2..ea743eee90 100644
--- a/src/mac/carbon/fontenum.cpp
+++ b/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
diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 6e387a01da..b897ec3b41 100644
--- a/src/mac/carbon/listbox.cpp
+++ b/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
+
diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index c6c11f32c6..c9798d0151 100644
--- a/src/mac/carbon/mdi.cpp
+++ b/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
+
diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 752b676d79..f6e54f8522 100644
--- a/src/mac/carbon/notebmac.cpp
+++ b/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
+
diff --git a/src/mac/carbon/printdlg.cpp b/src/mac/carbon/printdlg.cpp
index e39c6dd133..e44d56bb19 100644
--- a/src/mac/carbon/printdlg.cpp
+++ b/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
+
diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 834d523ccf..f7238e84ce 100644
--- a/src/mac/carbon/printmac.cpp
+++ b/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
diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 2470710782..e69336b952 100644
--- a/src/mac/carbon/radiobox.cpp
+++ b/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
diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 6819f25a91..d3c4187940 100644
--- a/src/mac/carbon/radiobut.cpp
+++ b/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
diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index cb22a96bed..1ebe5ec765 100644
--- a/src/mac/carbon/statbmp.cpp
+++ b/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
+
diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index c2d3460d41..23b359dcb2 100644
--- a/src/mac/carbon/statbox.cpp
+++ b/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
\ No newline at end of file
diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index d4f3e31c97..fac851267e 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/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
}
}
}
--
2.47.2