Added wxDataViewListCtrl, use it in the sample

[wxWidgets.git] / include / wx / propgrid / manager.h

diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index c3768ab07a8d8dab8e76d1153181e43e839559f0..58850722645814f0ba5acd283d8eec0218dcc997 100644 (file)
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -442,10 +442,12 @@ public:
     */
     int GetPageByState( const wxPropertyGridPageState* pstate ) const;
 
     */
     int GetPageByState( const wxPropertyGridPageState* pstate ) const;
 

+protected:

     /** Returns wxPropertyGridPageState of given page, current page's for -1.
     */
     virtual wxPropertyGridPageState* GetPageState( int page ) const;
 
     /** Returns wxPropertyGridPageState of given page, current page's for -1.
     */
     virtual wxPropertyGridPageState* GetPageState( int page ) const;
 

+public:

     /** Returns number of managed pages. */
     size_t GetPageCount() const;
 
     /** Returns number of managed pages. */
     size_t GetPageCount() const;
 


@@ -610,15 +612,13 @@ protected:
     */
     virtual wxPropertyGrid* CreatePropertyGrid() const;
 
     */
     virtual wxPropertyGrid* CreatePropertyGrid() const;
 

-    virtual void RefreshProperty( wxPGProperty* p );
-

 public:
 public:

+    virtual void RefreshProperty( wxPGProperty* p );

 
     //
     // Overridden functions - no documentation required.
     //
 
 
     //
     // Overridden functions - no documentation required.
     //
 

-    virtual wxSize DoGetBestSize() const;

     void SetId( wxWindowID winid );
 
     virtual void Freeze();
     void SetId( wxWindowID winid );
 
     virtual void Freeze();


@@ -628,11 +628,13 @@ public:
     virtual void SetWindowStyleFlag ( long style );
 
 protected:
     virtual void SetWindowStyleFlag ( long style );
 
 protected:

+    virtual wxSize DoGetBestSize() const;

 
 public:
 
 #ifndef SWIG
 
 
 public:
 
 #ifndef SWIG
 

+    virtual bool ProcessEvent( wxEvent& event );

     //
     // Event handlers
     //
     //
     // Event handlers
     //


@@ -713,7 +715,7 @@ protected:
     /** (Re)creates/destroys controls, according to the window style bits. */
     void RecreateControls();
 
     /** (Re)creates/destroys controls, according to the window style bits. */
     void RecreateControls();
 

-    void RefreshHelpBox( int new_splittery, int new_width, int new_height );
+    void UpdateDescriptionBox( int new_splittery, int new_width, int new_height );

 
     void RepaintSplitter( wxDC& dc,
                           int new_splittery,
 
     void RepaintSplitter( wxDC& dc,
                           int new_splittery,


@@ -727,8 +729,6 @@ protected:
     virtual bool SetEditableStateItem( const wxString& name, wxVariant value );
     virtual wxVariant GetEditableStateItem( const wxString& name ) const;
 
     virtual bool SetEditableStateItem( const wxString& name, wxVariant value );
     virtual wxVariant GetEditableStateItem( const wxString& name ) const;
 

-    virtual bool ProcessEvent( wxEvent& event );
-

 private:
     DECLARE_EVENT_TABLE()
 #endif // #ifndef SWIG
 private:
     DECLARE_EVENT_TABLE()
 #endif // #ifndef SWIG