Implement GetPageText for the OSX WebKit implementation.

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

diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 353ea114b40b86f8e458941ea946f8a9fba20237..39752a122206368d52b288db0448c97285b160b6 100644 (file)
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -128,7 +128,7 @@ public:
     */
     int GetToolId() const
     {
     */
     int GetToolId() const
     {

-        return m_id;
+        return m_toolId;

     }
 
     /** Do any member initialization in this method.
     }
 
     /** Do any member initialization in this method.


@@ -176,7 +176,9 @@ protected:
 
     wxPropertyGridManager*  m_manager;
 
 
     wxPropertyGridManager*  m_manager;
 

-    int                     m_id;  // toolbar index
+    // Toolbar tool id. Note that this is only valid when the tool bar
+    // exists.
+    int                     m_toolId;

 
 private:
     bool                    m_isDefault; // is this base page object?
 
 private:
     bool                    m_isDefault; // is this base page object?


@@ -614,7 +616,7 @@ protected:
 
     /**
         Creates property grid for the manager. Reimplement in derived class to
 
     /**
         Creates property grid for the manager. Reimplement in derived class to

-        use subclassed wxPropertyGrid. However, if you you do this then you
+        use subclassed wxPropertyGrid. However, if you do this then you

         must also use the two-step construction (ie. default constructor and
         Create() instead of constructor with arguments) when creating the
         manager.
         must also use the two-step construction (ie. default constructor and
         Create() instead of constructor with arguments) when creating the
         manager.


@@ -688,15 +690,15 @@ protected:
 
     int             m_splitterHeight;
 
 
     int             m_splitterHeight;
 

-    int             m_nextTbInd;
-

     int             m_dragOffset;
 
     wxCursor        m_cursorSizeNS;
 
     int             m_nextDescBoxSize;
 
     int             m_dragOffset;
 
     wxCursor        m_cursorSizeNS;
 
     int             m_nextDescBoxSize;
 

-    wxWindowID      m_baseId;
+    // Toolbar tool ids for categorized and alphabetic mode selectors.
+    int             m_categorizedModeToolId;
+    int             m_alphabeticModeToolId;

 
     unsigned char   m_dragStatus;
 
 
     unsigned char   m_dragStatus;