another DMC build fix (http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/93155)

[wxWidgets.git] / include / wx / gtk / dataview.h

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index bbb7f6b7e8245dd8db1fb483b4c5eab499947da0..1b6ecf086cb35cd4efd263ddc41bc6925215a5be 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -19,15 +19,15 @@
 // classes
 // --------------------------------------------------------- 
 
-class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;
-class WXDLLIMPEXP_FWD_CORE wxDataViewCtrlInternal;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;
 
 
 // --------------------------------------------------------- 
 // wxDataViewRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewRenderer: public wxDataViewRendererBase
+class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase
 {
 public:
     wxDataViewRenderer( const wxString &varianttype, 
@@ -55,7 +55,7 @@ protected:
 // wxDataViewTextRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewTextRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer
 {
 public:
     wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), 
@@ -75,7 +75,7 @@ protected:
 // wxDataViewBitmapRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewBitmapRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer
 {
 public:
     wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), 
@@ -93,7 +93,7 @@ protected:
 // wxDataViewToggleRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewToggleRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
 {
 public:
     wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), 
@@ -111,7 +111,7 @@ protected:
 // wxDataViewCustomRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewCustomRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer
 {
 public:
     wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), 
@@ -122,6 +122,9 @@ public:
 
 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
+    
+    void RenderText( const wxString &text, int xoffset,  wxRect cell, wxDC *dc, int state );
+    
     virtual wxSize GetSize() const = 0;
 
     virtual bool Activate( wxRect cell,
@@ -148,7 +151,17 @@ protected:
 
 private:
     wxDC        *m_dc;
-    
+
+public:    
+    // Internal, temporay for RenderText.
+    GtkCellRenderer      *m_text_renderer;
+    GdkWindow            *window;
+    GtkWidget            *widget;
+    void                 *background_area;
+    void                 *cell_area;
+    void                 *expose_area;
+    int                   flags;
+
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };
@@ -157,7 +170,7 @@ protected:
 // wxDataViewProgressRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewProgressRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer
 {
 public:
     wxDataViewProgressRenderer( const wxString &label = wxEmptyString, 
@@ -184,7 +197,7 @@ protected:
 // wxDataViewIconTextRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
 {
 public:
     wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), 
@@ -213,7 +226,7 @@ protected:
 // wxDataViewDateRenderer
 // --------------------------------------------------------- 
 
-class wxDataViewDateRenderer: public wxDataViewCustomRenderer
+class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer
 {
 public:
     wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), 
@@ -239,7 +252,7 @@ protected:
 // wxDataViewColumn
 // --------------------------------------------------------- 
 
-class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
+class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
 {
 public:
     wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
@@ -305,13 +318,14 @@ protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
 };
 
-WX_DECLARE_LIST(wxDataViewColumn, wxDataViewColumnList );
+WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
+                          class WXDLLIMPEXP_ADV);
 
 // --------------------------------------------------------- 
 // wxDataViewCtrl
 // --------------------------------------------------------- 
 
-class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase
+class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase
 {
 public:
     wxDataViewCtrl() 
@@ -338,6 +352,7 @@ public:
 
     virtual bool AssociateModel( wxDataViewModel *model );
     
+    virtual bool PrependColumn( wxDataViewColumn *col );
     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual unsigned int GetColumnCount() const;
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;