added missing include file and conditional compilation

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

diff --git a/src/mac/carbon/palette.cpp b/src/mac/carbon/palette.cpp
index 85a9fd16d8346f140ac9127f71b2217f94747e27..1c18196135861acd9c20f81456b50ce4ef9b34dd 100644 (file)
--- a/src/mac/carbon/palette.cpp
+++ b/src/mac/carbon/palette.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "palette.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_PALETTE
+
 #include "wx/palette.h"
 
 #if !USE_SHARED_LIBRARIES
@@ -106,4 +110,6 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
     return TRUE;
 }
 
+#endif
+    // wxUSE_PALETTE
 

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index f522366b3204fe4ce60e0bb6186f17c0ba2119f7..c6a6d86e092aec816ccd0c601333fc1677a232e1 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "textctrl.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_TEXTCTRL
+
 #ifdef __DARWIN__
   #include <sys/types.h>
   #include <sys/stat.h>
@@ -784,3 +788,5 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
+#endif
+    // wxUSE_TEXTCTRL

diff --git a/src/mac/palette.cpp b/src/mac/palette.cpp
index 85a9fd16d8346f140ac9127f71b2217f94747e27..1c18196135861acd9c20f81456b50ce4ef9b34dd 100644 (file)
--- a/src/mac/palette.cpp
+++ b/src/mac/palette.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "palette.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_PALETTE
+
 #include "wx/palette.h"
 
 #if !USE_SHARED_LIBRARIES
@@ -106,4 +110,6 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi
     return TRUE;
 }
 
+#endif
+    // wxUSE_PALETTE
 

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index f522366b3204fe4ce60e0bb6186f17c0ba2119f7..c6a6d86e092aec816ccd0c601333fc1677a232e1 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "textctrl.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_TEXTCTRL
+
 #ifdef __DARWIN__
   #include <sys/types.h>
   #include <sys/stat.h>
@@ -784,3 +788,5 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
+#endif
+    // wxUSE_TEXTCTRL