added wxMAKE_UNIQUE_NAME to wx/defs.h, use it in wx/debug.h

[wxWidgets.git] / include / wx / generic / gridctrl.h

diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h
index 9a87f635ffe70ac066b5f7581764569ebed6d514..b607c326075f22117700c49787975048893167c8 100644 (file)
--- a/include/wx/generic/gridctrl.h
+++ b/include/wx/generic/gridctrl.h
@@ -12,10 +12,12 @@
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 
 #ifndef _WX_GENERIC_GRIDCTRL_H_
 #define _WX_GENERIC_GRIDCTRL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "gridctrl.h"
 #endif
 
     #pragma interface "gridctrl.h"
 #endif
 

+#if wxUSE_GRID
+

 #include "wx/grid.h"
 #include "wx/string.h"
 #include "wx/datetime.h"
 #include "wx/grid.h"
 #include "wx/string.h"
 #include "wx/datetime.h"


@@ -23,6 +25,8 @@
 #define wxGRID_VALUE_CHOICEINT    _T("choiceint")
 #define wxGRID_VALUE_DATETIME     _T("datetime")
 
 #define wxGRID_VALUE_CHOICEINT    _T("choiceint")
 #define wxGRID_VALUE_DATETIME     _T("datetime")
 

+#if wxUSE_DATETIME
+

 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {


@@ -57,6 +61,7 @@ protected:
     wxDateTime::TimeZone m_tz;
 };
 
     wxDateTime::TimeZone m_tz;
 };
 

+#endif // wxUSE_DATETIME

 
 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer
 
 // the default renderer for the cells containing Time and dates..
 class WXDLLEXPORT wxGridCellEnumRenderer : public wxGridCellStringRenderer


@@ -89,6 +94,8 @@ protected:
 };
 
 
 };
 
 

+#if wxUSE_COMBOBOX
+

 class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
 {
 public:
 class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
 {
 public:


@@ -104,8 +111,9 @@ private:
     long int   m_startint;
 };
 
     long int   m_startint;
 };
 

+#endif // wxUSE_COMBOBOX

 
 

-class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
+class WXDLLEXPORT wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor

 {
 public:
     wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
 {
 public:
     wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }


@@ -117,7 +125,7 @@ public:
         { return new wxGridCellAutoWrapStringEditor; }
 };
 
         { return new wxGridCellAutoWrapStringEditor; }
 };
 

-class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
+class WXDLLEXPORT wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer

 {
 public:
     wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }
 {
 public:
     wxGridCellAutoWrapStringRenderer() : wxGridCellStringRenderer() { }


@@ -146,5 +154,7 @@ private:
 
 };
 
 
 };
 

+#endif  // #if wxUSE_GRID
+

 #endif //_WX_GENERIC_GRIDCTRL_H_
 
 #endif //_WX_GENERIC_GRIDCTRL_H_