Fixed regression: in wxPropertyGrid::PerformValidation(), wxPGProperty::ValidateValue...

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

diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index 861844963599935bde3a910169595da42112d8fe..679e229ba252afdfd57de179d373d6f830b52104 100644 (file)
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -32,7 +32,7 @@ public:
 // constructors / destructor
 //
   wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT);
 // constructors / destructor
 //
   wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT);

-  
+

   virtual ~wxDataViewRenderer(void);
 
 //
   virtual ~wxDataViewRenderer(void);
 
 //


@@ -74,7 +74,7 @@ public:
     return this->m_NativeDataPtr;
   }
 
     return this->m_NativeDataPtr;
   }
 

-  virtual bool Render() = 0; // a call to the native data browser function to render the data;
+  virtual bool MacRender() = 0; // a call to the native data browser function to render the data;

                              // returns true if the data value could be rendered, false otherwise
 
   void SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr);
                              // returns true if the data value could be rendered, false otherwise
 
   void SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr);


@@ -150,7 +150,7 @@ public:
 //
 // implementation
 //
 //
 // implementation
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
   void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 
 
   void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 


@@ -184,7 +184,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
 //
 // inherited functions from wxDataViewRenderer
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
 protected:
 private:
 
 protected:
 private:


@@ -222,7 +222,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
 //
 // inherited functions from wxDataViewRenderer
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
 protected:
 private:
 
 protected:
 private:


@@ -247,7 +247,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
 //
 // inherited functions from wxDataViewRenderer
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
 //
 // implementation
 
 //
 // implementation


@@ -283,7 +283,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
 //
 // inherited functions from wxDataViewRenderer
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
 protected:
 private:
 
 protected:
 private:


@@ -302,7 +302,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
 //
 // inherited functions from wxDataViewRenderer
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
 protected:
 private:
 
 protected:
 private:


@@ -322,7 +322,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
 //
 // inherited functions from wxDataViewRenderer
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
 protected:
 private:
 
 protected:
 private:


@@ -341,7 +341,7 @@ public:
 //
 // inherited functions from wxDataViewRenderer
 //
 //
 // inherited functions from wxDataViewRenderer
 //

-  virtual bool Render();
+  virtual bool MacRender();

 
 protected:
 private:
 
 protected:
 private:


@@ -400,12 +400,16 @@ public:
     {
       return this->m_NativeDataPtr;
     }
     {
       return this->m_NativeDataPtr;
     }

-    
+

     void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer
     void SetWidthVariable(int NewWidth)
     {
         m_width = NewWidth;
     }
     void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer
     void SetWidthVariable(int NewWidth)
     {
         m_width = NewWidth;
     }

+    void SetSortOrderVariable(bool NewOrder)
+    {
+        m_ascending = NewOrder;
+    }

 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors


@@ -580,8 +584,11 @@ protected:
   virtual void DoSetExpanderColumn();
   virtual void DoSetIndent();
 
   virtual void DoSetExpanderColumn();
   virtual void DoSetIndent();
 

+  virtual wxSize DoGetBestSize() const;
+

  // event handling
   void OnSize(wxSizeEvent &event);
  // event handling
   void OnSize(wxSizeEvent &event);

+  void OnMouse(wxMouseEvent &event);

 
 private:
  // initializing of local variables:
 
 private:
  // initializing of local variables: