automated ifacecheck fixes

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

diff --git a/interface/wx/propgrid/manager.h b/interface/wx/propgrid/manager.h
index 7cf20d0ab790375288783ea9568d1b9710197b13..473dd12b54fa9ab9035b6df79c11b0547e01d2f7 100644 (file)
--- a/interface/wx/propgrid/manager.h
+++ b/interface/wx/propgrid/manager.h
@@ -2,22 +2,23 @@
 // Name:        manager.h
 // Purpose:     interface of wxPropertyGridManager
 // Author:      wxWidgets team
 // Name:        manager.h
 // Purpose:     interface of wxPropertyGridManager
 // Author:      wxWidgets team

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-/** @class wxPropertyGridPage
+/**
+    @class wxPropertyGridPage

 
     Holder of property grid page information. You can subclass this and
     give instance in wxPropertyGridManager::AddPage. It inherits from
     wxEvtHandler and can be used to process events specific to this
     page (id of events will still be same as manager's). If you don't
     want to use it to process all events of the page, you need to
 
     Holder of property grid page information. You can subclass this and
     give instance in wxPropertyGridManager::AddPage. It inherits from
     wxEvtHandler and can be used to process events specific to this
     page (id of events will still be same as manager's). If you don't
     want to use it to process all events of the page, you need to

-    return false in the derived wxPropertyGridPage::IsHandlingAllEvents.
+    return @false in the derived wxPropertyGridPage::IsHandlingAllEvents.

 
     Please note that wxPropertyGridPage lacks many non-const property
 
     Please note that wxPropertyGridPage lacks many non-const property

-    manipulation functions found in wxPropertyGridManager. Please use
-    parent manager (m_manager member variable) when needed.
+    manipulation functions found in wxPropertyGridManager.
+    Please use parent manager (m_manager member variable) when needed.

 
     Please note that most member functions are inherited and as such not
     documented on this page. This means you will probably also want to read
 
     Please note that most member functions are inherited and as such not
     documented on this page. This means you will probably also want to read


@@ -40,8 +41,8 @@ class WXDLLIMPEXP_PROPGRID wxPropertyGridPage : public wxEvtHandler,
                                                 public wxPropertyGridInterface
 {
     friend class wxPropertyGridManager;
                                                 public wxPropertyGridInterface
 {
     friend class wxPropertyGridManager;

-public:

 
 

+public:

     wxPropertyGridPage();
     virtual ~wxPropertyGridPage();
 
     wxPropertyGridPage();
     virtual ~wxPropertyGridPage();
 


@@ -84,10 +85,7 @@ public:
         Returns id of the tool bar item that represents this page on
         wxPropertyGridManager's wxToolBar.
     */
         Returns id of the tool bar item that represents this page on
         wxPropertyGridManager's wxToolBar.
     */

-    int GetToolId() const
-    {
-        return m_id;
-    }
+    int GetToolId() const;

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


@@ -95,13 +93,13 @@ public:
         @remarks - Called every time the page is added into a manager.
                 - You can add properties to the page here.
     */
         @remarks - Called every time the page is added into a manager.
                 - You can add properties to the page here.
     */

-    virtual void Init() {}
+    virtual void Init();

 
     /**
         Return false here to indicate unhandled events should be
         propagated to manager's parent, as normal.
     */
 
     /**
         Return false here to indicate unhandled events should be
         propagated to manager's parent, as normal.
     */

-    virtual bool IsHandlingAllEvents() const { return true; }
+    virtual bool IsHandlingAllEvents() const;

 
     /**
         Called every time page is about to be shown.
 
     /**
         Called every time page is about to be shown.


@@ -114,7 +112,9 @@ public:
     */
     virtual void RefreshProperty( wxPGProperty* p );
 
     */
     virtual void RefreshProperty( wxPGProperty* p );
 

-    /** Sets splitter position on page.
+    /**
+        Sets splitter position on page.
+

         @remarks
         Splitter position cannot exceed grid size, and therefore setting it
         during form creation may fail as initial grid size is often smaller than
         @remarks
         Splitter position cannot exceed grid size, and therefore setting it
         during form creation may fail as initial grid size is often smaller than


@@ -123,9 +123,9 @@ public:
     void SetSplitterPosition( int splitterPos, int col = 0 );
 };
 
     void SetSplitterPosition( int splitterPos, int col = 0 );
 };
 

-// -----------------------------------------------------------------------

 
 

-/** @class wxPropertyGridManager
+/**
+    @class wxPropertyGridManager

 
     wxPropertyGridManager is an efficient multi-page version of wxPropertyGrid,
     which can optionally have toolbar for mode and page selection, and a help text
 
     wxPropertyGridManager is an efficient multi-page version of wxPropertyGrid,
     which can optionally have toolbar for mode and page selection, and a help text


@@ -153,7 +153,6 @@ public:
     Here's some example code for creating and populating a wxPropertyGridManager:
 
     @code
     Here's some example code for creating and populating a wxPropertyGridManager:
 
     @code

-

         wxPropertyGridManager* pgMan = new wxPropertyGridManager(this, PGID,
             wxDefaultPosition, wxDefaultSize,
             // These and other similar styles are automatically
         wxPropertyGridManager* pgMan = new wxPropertyGridManager(this, PGID,
             wxDefaultPosition, wxDefaultSize,
             // These and other similar styles are automatically


@@ -171,8 +170,7 @@ public:
 
         wxPropertyGridPage* page;
 
 
         wxPropertyGridPage* page;
 

-        pgMan->AddPage(wxT("First Page"));
-        page = pgMan->GetLastPage();
+        page = pgMan->AddPage(wxT("First Page"));

 
         page->Append( new wxPropertyCategory(wxT("Category A1")) );
 
 
         page->Append( new wxPropertyCategory(wxT("Category A1")) );
 


@@ -180,16 +178,13 @@ public:
 
         page->Append( new wxColourProperty(wxT("Colour"),wxPG_LABEL,*wxWHITE) );
 
 
         page->Append( new wxColourProperty(wxT("Colour"),wxPG_LABEL,*wxWHITE) );
 

-        pgMan->AddPage(wxT("Second Page"));
-        page = pgMan->GetLastPage();
+        page = pgMan->AddPage(wxT("Second Page"));

 
         page->Append( wxT("Text"),wxPG_LABEL,wxT("(no text)") );
 
         page->Append( new wxFontProperty(wxT("Font"),wxPG_LABEL) );
 
         page->Append( wxT("Text"),wxPG_LABEL,wxT("(no text)") );
 
         page->Append( new wxFontProperty(wxT("Font"),wxPG_LABEL) );

-

     @endcode
 
     @endcode
 

-

     @section propgridmanager_window_styles_ Window Styles
 
     See @ref propgrid_window_styles.
     @section propgridmanager_window_styles_ Window Styles
 
     See @ref propgrid_window_styles.


@@ -220,25 +215,15 @@ public:
             wxPropertyGridPage instance. Manager will take ownership of this
             object. NULL indicates that a default page instance should be created.
 
             wxPropertyGridPage instance. Manager will take ownership of this
             object. NULL indicates that a default page instance should be created.
 

-        @return Returns index to the page created.
+        @return Returns pointer to created property grid page.

 
         @remarks If toolbar is used, it is highly recommended that the pages are
                 added when the toolbar is not turned off using window style flag
                 switching. Otherwise toolbar buttons might not be added properly.
     */
 
         @remarks If toolbar is used, it is highly recommended that the pages are
                 added when the toolbar is not turned off using window style flag
                 switching. Otherwise toolbar buttons might not be added properly.
     */

-    int AddPage( const wxString& label = wxEmptyString,
-                 const wxBitmap& bmp = wxPG_NULL_BITMAP,
-                 wxPropertyGridPage* pageObj = (wxPropertyGridPage*) NULL )
-    {
-        return InsertPage(-1,label,bmp,pageObj);
-    }
-
-    void ClearModifiedStatus( wxPGPropArg id );
-
-    void ClearModifiedStatus()
-    {
-        m_pPropGrid->ClearModifiedStatus();
-    }
+    wxPropertyGridPage* AddPage( const wxString& label = wxEmptyString,
+                                 const wxBitmap& bmp = wxPG_NULL_BITMAP,
+                                 wxPropertyGridPage* pageObj = NULL );

 
     /**
         Deletes all properties and all pages.
 
     /**
         Deletes all properties and all pages.


@@ -255,10 +240,7 @@ public:
 
         @return Returns @true if value was actually updated.
     */
 
         @return Returns @true if value was actually updated.
     */

-    bool CommitChangesFromEditor( wxUint32 flags = 0 )
-    {
-        return m_pPropGrid->CommitChangesFromEditor(flags);
-    }
+    bool CommitChangesFromEditor( wxUint32 flags = 0 );

 
     /**
         Two step creation. Whenever the control is created without any parameters,
 
     /**
         Two step creation. Whenever the control is created without any parameters,


@@ -279,13 +261,7 @@ public:
         @remarks
             Calling his may not properly update toolbar buttons.
     */
         @remarks
             Calling his may not properly update toolbar buttons.
     */

-    bool EnableCategories( bool enable )
-    {
-        long fl = m_windowStyle | wxPG_HIDE_CATEGORIES;
-        if ( enable ) fl = m_windowStyle & ~(wxPG_HIDE_CATEGORIES);
-        SetWindowStyleFlag(fl);
-        return true;
-    }
+    bool EnableCategories( bool enable );

 
     /**
         Selects page, scrolls and/or expands items to ensure that the
 
     /**
         Selects page, scrolls and/or expands items to ensure that the


@@ -295,30 +271,6 @@ public:
     */
     bool EnsureVisible( wxPGPropArg id );
 
     */
     bool EnsureVisible( wxPGPropArg id );
 

-    /**
-        Returns number of children of the root property of the selected page.
-    */
-    size_t GetChildrenCount()
-    {
-        return GetChildrenCount( m_pPropGrid->m_pState->m_properties );
-    }
-
-    /**
-        Returns number of children of the root property of given page.
-    */
-    size_t GetChildrenCount( int pageIndex );
-
-    /**
-        Returns number of children for the property.
-
-        NB: Cannot be in container methods class due to name hiding.
-    */
-    size_t GetChildrenCount( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(0)
-        return p->GetChildCount();
-    }
-

     /**
         Returns number of columns on given page. By the default,
         returns number of columns on current page.
     /**
         Returns number of columns on given page. By the default,
         returns number of columns on current page.


@@ -350,29 +302,15 @@ public:
     */
     wxPropertyGridPage* GetCurrentPage() const;
 
     */
     wxPropertyGridPage* GetCurrentPage() const;
 

-    /**
-        Returns last page.
-    */
-    wxPropertyGridPage* GetLastPage() const
-    {
-        return GetPage(m_arrPages.size()-1);
-    }
-

     /**
         Returns page object for given page index.
     */
     /**
         Returns page object for given page index.
     */

-    wxPropertyGridPage* GetPage( unsigned int ind ) const
-    {
-        return (wxPropertyGridPage*)m_arrPages.Item(ind);
-    }
+    wxPropertyGridPage* GetPage( unsigned int ind ) const;

 
     /**
         Returns page object for given page name.
     */
 
     /**
         Returns page object for given page name.
     */

-    wxPropertyGridPage* GetPage( const wxString& name ) const
-    {
-        return GetPage(GetPageByName(name));
-    }
+    wxPropertyGridPage* GetPage( const wxString& name ) const;

 
     /**
         Returns index for a page name. If no match is found, wxNOT_FOUND is
 
     /**
         Returns index for a page name. If no match is found, wxNOT_FOUND is


@@ -385,7 +323,9 @@ public:
     */
     size_t GetPageCount() const;
 
     */
     size_t GetPageCount() const;
 

-    /** Returns name of given page. */
+    /**
+        Returns name of given page.
+    */

     const wxString& GetPageName( int index ) const;
 
     /**
     const wxString& GetPageName( int index ) const;
 
     /**


@@ -395,24 +335,22 @@ public:
     wxPGProperty* GetPageRoot( int index ) const;
 
     /** Returns index to currently selected page. */
     wxPGProperty* GetPageRoot( int index ) const;
 
     /** Returns index to currently selected page. */

-    int GetSelectedPage() const { return m_selPage; }
+    int GetSelectedPage() const;

 
     /** Shortcut for GetGrid()->GetSelection(). */
 
     /** Shortcut for GetGrid()->GetSelection(). */

-    wxPGProperty* GetSelectedProperty() const
-    {
-        return m_pPropGrid->GetSelection();
-    }
+    wxPGProperty* GetSelectedProperty() const;

 
     /** Synonyme for GetSelectedPage. */
 
     /** Synonyme for GetSelectedPage. */

-    int GetSelection() const { return m_selPage; }
+    int GetSelection() const;

 
     /**
         Returns a pointer to the toolbar currently associated with the
         wxPropertyGridManager (if any).
     */
 
     /**
         Returns a pointer to the toolbar currently associated with the
         wxPropertyGridManager (if any).
     */

-    wxToolBar* GetToolBar() const { return m_pToolbar; }
+    wxToolBar* GetToolBar() const;

 
 

-    /** Creates new property page. Note that the first page is not created
+    /**
+        Creates new property page. Note that the first page is not created

         automatically.
 
         @param index
         automatically.
 
         @param index


@@ -429,11 +367,11 @@ public:
             wxPropertyGridPage instance. Manager will take ownership of this
             object. If NULL, default page object is constructed.
 
             wxPropertyGridPage instance. Manager will take ownership of this
             object. If NULL, default page object is constructed.
 

-        @return Returns index to the page created.
+        @return Returns pointer to created page.

     */
     */

-    virtual int InsertPage( int index, const wxString& label,
-                            const wxBitmap& bmp = wxNullBitmap,
-                            wxPropertyGridPage* pageObj = NULL );
+    virtual wxPropertyGridPage* InsertPage( int index, const wxString& label,
+                                            const wxBitmap& bmp = wxNullBitmap,
+                                            wxPropertyGridPage* pageObj = NULL );

 
     /**
         Returns @true if any property on any page has been modified by the user.
 
     /**
         Returns @true if any property on any page has been modified by the user.


@@ -441,8 +379,7 @@ public:
     bool IsAnyModified() const;
 
     /**
     bool IsAnyModified() const;
 
     /**

-        Returns @true if updating is frozen (ie. Freeze() called but not yet
-        Thaw() ).
+        Returns @true if updating is frozen (ie. Freeze() called but not yet Thaw() ).

     */
     bool IsFrozen() const;
 
     */
     bool IsFrozen() const;
 


@@ -451,13 +388,15 @@ public:
     */
     bool IsPageModified( size_t index ) const;
 
     */
     bool IsPageModified( size_t index ) const;
 

-    /** Removes a page.
+    /**
+        Removes a page.

 
         @return Returns @false if it was not possible to remove page in question.
     */
     virtual bool RemovePage( int page );
 
 
         @return Returns @false if it was not possible to remove page in question.
     */
     virtual bool RemovePage( int page );
 

-    /** Select and displays a given page.
+    /**
+        Select and displays a given page.

 
         @param index
             Index of page being seleced. Can be -1 to select nothing.
 
         @param index
             Index of page being seleced. Can be -1 to select nothing.


@@ -480,14 +419,16 @@ public:
     */
     void SetColumnCount( int colCount, int page = -1 );
 
     */
     void SetColumnCount( int colCount, int page = -1 );
 

-    /** Sets label and text in description box.
+    /**
+        Sets label and text in description box.

     */
     void SetDescription( const wxString& label, const wxString& content );
 
     /** Sets y coordinate of the description box splitter. */
     void SetDescBoxHeight( int ht, bool refresh = true );
 
     */
     void SetDescription( const wxString& label, const wxString& content );
 
     /** Sets y coordinate of the description box splitter. */
     void SetDescBoxHeight( int ht, bool refresh = true );
 

-    /** Moves splitter as left as possible, while still allowing all
+    /**
+        Moves splitter as left as possible, while still allowing all

         labels to be shown in full.
 
         @param subProps
         labels to be shown in full.
 
         @param subProps


@@ -500,10 +441,7 @@ public:
     void SetSplitterLeft( bool subProps = false, bool allPages = true );
 
     /** Sets splitter position on individual page. */
     void SetSplitterLeft( bool subProps = false, bool allPages = true );
 
     /** Sets splitter position on individual page. */

-    void SetPageSplitterPosition( int page, int pos, int column = 0 )
-    {
-        GetPage(page)->DoSetSplitterPosition( pos, column );
-    }
+    void SetPageSplitterPosition( int page, int pos, int column = 0 );

 
     /**
         Sets splitter position for all pages.
 
     /**
         Sets splitter position for all pages.


@@ -516,10 +454,7 @@ public:
     void SetSplitterPosition( int pos, int column = 0 );
 
     /** Synonyme for SelectPage(name). */
     void SetSplitterPosition( int pos, int column = 0 );
 
     /** Synonyme for SelectPage(name). */

-    void SetStringSelection( const wxChar* name )
-    {
-        SelectPage( GetPageByName(name) );
-    }
+    void SetStringSelection( const wxChar* name );

 
 protected:
 
 
 protected:
 


@@ -528,10 +463,8 @@ protected:
     //
 
     /**
     //
 
     /**

-        Creates property grid for the manager. Override to use subclassed
-        wxPropertyGrid.
+        Creates property grid for the manager.
+        Override to use subclassed wxPropertyGrid.

     */
     virtual wxPropertyGrid* CreatePropertyGrid() const;
 };
     */
     virtual wxPropertyGrid* CreatePropertyGrid() const;
 };

-
-// -----------------------------------------------------------------------