add more wxUSE_XXX checks

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

diff --git a/include/wx/imagxpm.h b/include/wx/imagxpm.h
index f9af1ba2252acdb4c3aad08bfc134a1d8f02012e..77181f8f6c771c1c6eb1a71efc6363fb75c0bca5 100644 (file)
--- a/include/wx/imagxpm.h
+++ b/include/wx/imagxpm.h
@@ -12,6 +12,7 @@
 
 #include "wx/image.h"
 
 
 #include "wx/image.h"
 

+#if wxUSE_XPM

 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
 
 //-----------------------------------------------------------------------------
 // wxXPMHandler


@@ -39,6 +40,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 };
 
     DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 };
 

+#endif // wxUSE_XPM

 
 #endif
   // _WX_IMAGXPM_H_
 
 #endif
   // _WX_IMAGXPM_H_

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 86b09ff0c2cb77822b453b6c4eec19127f22b4d6..6bfd68285eefb584f78f35c12f56d9b3a99c3d0e 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -732,7 +732,7 @@
  */
 
 #ifndef wxUSE_FILECONFIG
  */
 
 #ifndef wxUSE_FILECONFIG

-#    if wxUSE_CONFIG
+#    if wxUSE_CONFIG && wxUSE_TEXTFILE

 #        define wxUSE_FILECONFIG 1
 #    else
 #        define wxUSE_FILECONFIG 0
 #        define wxUSE_FILECONFIG 1
 #    else
 #        define wxUSE_FILECONFIG 0

diff --git a/include/wx/tipdlg.h b/include/wx/tipdlg.h
index 7058568f8c548c621bac1f215ad52bdade7495b2..5f5ecc6c305775959264ff95c055333ec3f3dd4f 100644 (file)
--- a/include/wx/tipdlg.h
+++ b/include/wx/tipdlg.h
@@ -61,8 +61,10 @@ protected:
 // specified text file as the source of tips (each line is a tip).
 //
 // NB: the caller is responsible for deleting the pointer!
 // specified text file as the source of tips (each line is a tip).
 //
 // NB: the caller is responsible for deleting the pointer!

+#if wxUSE_TEXTFILE

 WXDLLIMPEXP_ADV wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
                                                        size_t currentTip);
 WXDLLIMPEXP_ADV wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
                                                        size_t currentTip);

+#endif // wxUSE_TEXTFILE

 
 // ----------------------------------------------------------------------------
 // wxTipDialog
 
 // ----------------------------------------------------------------------------
 // wxTipDialog

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 85a63ad860a9929b9fc6d89541be622eb105a27e..7b3ce8b0b72468cc93d419ed90d0ef99bb8b64ca 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -71,6 +71,7 @@ static const int wxID_NEXT_TIP = 32000;  // whatever
 
 // an implementation which takes the tips from the text file - each line
 // represents a tip
 
 // an implementation which takes the tips from the text file - each line
 // represents a tip

+#if wxUSE_TEXTFILE

 class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
 {
 public:
 class WXDLLIMPEXP_ADV wxFileTipProvider : public wxTipProvider
 {
 public:


@@ -83,6 +84,7 @@ private:
 
     DECLARE_NO_COPY_CLASS(wxFileTipProvider)
 };
 
     DECLARE_NO_COPY_CLASS(wxFileTipProvider)
 };

+#endif // wxUSE_TEXTFILE

 
 #ifdef __WIN32__
 // TODO an implementation which takes the tips from the given registry key
 
 #ifdef __WIN32__
 // TODO an implementation which takes the tips from the given registry key


@@ -137,7 +139,7 @@ private:
 // ----------------------------------------------------------------------------
 // wxFileTipProvider
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileTipProvider
 // ----------------------------------------------------------------------------

-
+#if wxUSE_TEXTFILE

 wxFileTipProvider::wxFileTipProvider(const wxString& filename,
                                      size_t currentTip)
                  : wxTipProvider(currentTip), m_textfile(filename)
 wxFileTipProvider::wxFileTipProvider(const wxString& filename,
                                      size_t currentTip)
                  : wxTipProvider(currentTip), m_textfile(filename)


@@ -203,6 +205,7 @@ wxString wxFileTipProvider::GetTip()
 
     return tip;
 }
 
     return tip;
 }

+#endif // wxUSE_TEXTFILE

 
 // ----------------------------------------------------------------------------
 // wxTipDialog
 
 // ----------------------------------------------------------------------------
 // wxTipDialog


@@ -328,11 +331,13 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
 // our public interface
 // ----------------------------------------------------------------------------
 
 // our public interface
 // ----------------------------------------------------------------------------
 

+#if wxUSE_TEXTFILE

 wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
                                        size_t currentTip)
 {
     return new wxFileTipProvider(filename, currentTip);
 }
 wxTipProvider *wxCreateFileTipProvider(const wxString& filename,
                                        size_t currentTip)
 {
     return new wxFileTipProvider(filename, currentTip);
 }

+#endif // wxUSE_TEXTFILE

 
 bool wxShowTip(wxWindow *parent,
                wxTipProvider *tipProvider,
 
 bool wxShowTip(wxWindow *parent,
                wxTipProvider *tipProvider,

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index b763b5de8e9051f460441b936932a61e7d2be0a7..4ea98d5bb0dc450453fd37884705350f1b2c9cfa 100644 (file)
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -287,6 +287,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto-completion
 // ----------------------------------------------------------------------------
 
 // auto-completion
 // ----------------------------------------------------------------------------
 

+#if wxUSE_OLE

 bool wxTextEntry::AutoCompleteFileNames()
 {
 #ifdef HAS_AUTOCOMPLETE
 bool wxTextEntry::AutoCompleteFileNames()
 {
 #ifdef HAS_AUTOCOMPLETE


@@ -378,6 +379,7 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
     return false;
 #endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
 }
     return false;
 #endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
 }

+#endif // wxUSE_OLE

 
 // ----------------------------------------------------------------------------
 // editable state
 
 // ----------------------------------------------------------------------------
 // editable state