do the VC6 hacks only when compiling with VC6

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

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 401114348594edcd58ae07e12b0686233dabf831..d20ee24a770c1814b1eacfc8b1b1b95c1024381d 100644 (file)
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -7,13 +7,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDATAVIEWCTRLH__
-#define __GTKDATAVIEWCTRLH__
+#ifndef _WX_GTKDATAVIEWCTRL_H_
+#define _WX_GTKDATAVIEWCTRL_H_

 
 

-#include "wx/defs.h"
-#include "wx/object.h"

 #include "wx/list.h"
 #include "wx/list.h"

-#include "wx/control.h"

 
 // --------------------------------------------------------- 
 // classes
 
 // --------------------------------------------------------- 
 // classes


@@ -304,6 +301,7 @@ public:
     virtual void SetMinWidth( int minWidth );
     virtual void SetWidth( int width );
 
     virtual void SetMinWidth( int minWidth );
     virtual void SetWidth( int width );
 

+    virtual void SetReorderable( bool reorderable );

 
     // getters:
 
 
     // getters:
 


@@ -317,6 +315,8 @@ public:
 
     virtual int GetWidth() const;
     virtual int GetMinWidth() const;
 
     virtual int GetWidth() const;
     virtual int GetMinWidth() const;

+    
+    virtual bool IsReorderable() const;

 
     // implementation
     GtkWidget* GetGtkHandle() { return m_column; }
 
     // implementation
     GtkWidget* GetGtkHandle() { return m_column; }


@@ -409,29 +409,29 @@ public:
     GtkWidget *GtkGetTreeView() { return m_treeview; }
     wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }
 
     GtkWidget *GtkGetTreeView() { return m_treeview; }
     wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }
 

+    virtual void OnInternalIdle();
+

 protected:
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
 private:
 protected:
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
 private:

-    friend class wxDataViewCtrlDC;
+    friend class wxDataViewCtrlDCImpl;

     friend class wxDataViewColumn;
     friend class wxGtkDataViewModelNotifier;
     friend class wxDataViewColumn;
     friend class wxGtkDataViewModelNotifier;

+    friend class wxDataViewCtrlInternal;
+    

     GtkWidget               *m_treeview;
     wxDataViewModelNotifier *m_notifier;
     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;
 
     GtkWidget               *m_treeview;
     wxDataViewModelNotifier *m_notifier;
     wxDataViewCtrlInternal  *m_internal;
     wxDataViewColumnList     m_cols;
 

-    
-    virtual void OnInternalIdle();
-    

     void GtkEnableSelectionEvents();
     void GtkDisableSelectionEvents();
     
     void GtkEnableSelectionEvents();
     void GtkDisableSelectionEvents();
     

-private:

     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
     DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
 };
 
 

-#endif // __GTKDATAVIEWCTRLH__
+#endif // _WX_GTKDATAVIEWCTRL_H_