codelite-git Mailing List for CodeLite (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".

The branch, master has been updated
       via  934609332a1b063343d58cefe5fe12eb80aa27ad (commit)
      from  e206e5a47381ba8542a7e0d55acdead877a217c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/934609332a1b063343d58cefe5fe12eb80aa27ad

commit 934609332a1b063343d58cefe5fe12eb80aa27ad
Author: Eran <era...@gm...>
Date:   Mon Jan 6 14:19:02 2014 +0200

    Fixed undefined symbol when using native book API

diff --git a/Plugin/gtk_notebook_ex.cpp b/Plugin/gtk_notebook_ex.cpp
index 5ee7bab..53f8daf 100644
--- a/Plugin/gtk_notebook_ex.cpp
+++ b/Plugin/gtk_notebook_ex.cpp
@@ -178,12 +178,7 @@ void Notebook::SetSelection(size_t page, bool notify)
 }

 

 

-size_t Notebook::GetSelection()

-{

-    return static_cast<size_t>(wxNotebook::GetSelection());

-}

-

-wxWindow* Notebook::GetPage(size_t page)

+wxWindow* Notebook::GetPage(size_t page) const

 {

     if (page >= GetPageCount())

         return NULL;

@@ -302,7 +297,7 @@ void Notebook::SetRightClickMenu(wxMenu* menu)
     m_contextMenu = menu;

 }

 

-wxWindow* Notebook::GetCurrentPage()

+wxWindow* Notebook::GetCurrentPage() const

 {

     size_t selection = GetSelection();

     if (selection != Notebook::npos) {

@@ -311,7 +306,7 @@ wxWindow* Notebook::GetCurrentPage()
     return NULL;

 }

 

-size_t Notebook::GetPageIndex(wxWindow *page)

+size_t Notebook::GetPageIndex(wxWindow *page) const

 {

     if ( !page )

         return Notebook::npos;

@@ -324,7 +319,7 @@ size_t Notebook::GetPageIndex(wxWindow *page)
     return Notebook::npos;

 }

 

-size_t Notebook::GetPageIndex(const wxString& text)

+size_t Notebook::GetPageIndex(const wxString& text) const

 {

     for (size_t i=0; i< GetPageCount(); i++) {

 

diff --git a/Plugin/gtk_notebook_ex.h b/Plugin/gtk_notebook_ex.h
index 3a52281..54cefbf 100644
--- a/Plugin/gtk_notebook_ex.h
+++ b/Plugin/gtk_notebook_ex.h
@@ -76,7 +76,7 @@ class Notebook : public wxNotebook
 

 public:

 

-    static const size_t npos = static_cast<size_t>(-1);

+    static const size_t npos = static_cast<size_t>(wxNOT_FOUND);

 

 protected:

     void      Initialize();

@@ -106,12 +106,6 @@ public:
     virtual ~Notebook();

 

     /**

-     * \brief return the currently selected item index

-     * \return the currently selected item, of the book is empty, return Notebook::npos

-     */

-    size_t GetSelection();

-

-    /**

      * \brief set page at given index to be the selected page. this function does not trigger an event

      * \param page

      */

@@ -131,7 +125,7 @@ public:
      * \param page page's index

      * \return the page or NULL if index is out of bounds

      */

-    wxWindow *GetPage(size_t page);

+    wxWindow *GetPage(size_t page) const ;

 

     /**

      * \brief return the page caption

@@ -176,21 +170,21 @@ public:
      * \brief return the active page

      * \return active page or NULL if there are no pages in the book

      */

-    wxWindow *GetCurrentPage();

+    wxWindow *GetCurrentPage() const ;

 

     /**

      * \brief return page index by window pointer

      * \param page page to search

      * \return page index, or Notebook::npos if page does not exist in the notebook

      */

-    size_t GetPageIndex(wxWindow *page);

+    size_t GetPageIndex(wxWindow *page) const;

 

     /**

      * \brief return page index by page text

      * \param text text to search for

      * \return page index, or Notebook::npos if page does not exist in the notebook

      */

-    size_t GetPageIndex(const wxString &text);

+    size_t GetPageIndex(const wxString &text) const;

 

     /**

      * \brief set the text for page at a given index

diff --git a/Plugin/notebook_ex.cpp b/Plugin/notebook_ex.cpp
index ffd2da3..9c0f31c 100644
--- a/Plugin/notebook_ex.cpp
+++ b/Plugin/notebook_ex.cpp
@@ -262,7 +262,7 @@ void Notebook::SetRightClickMenu(wxMenu* menu)
     m_contextMenu = menu;

 }

 

-wxWindow* Notebook::GetCurrentPage()

+wxWindow* Notebook::GetCurrentPage() const

 {

     size_t selection = GetSelection();

     if (selection != Notebook::npos) {

diff --git a/Plugin/notebook_ex.h b/Plugin/notebook_ex.h
index 1e9f708..ba0c609 100644
--- a/Plugin/notebook_ex.h
+++ b/Plugin/notebook_ex.h
@@ -144,7 +144,7 @@ public:
      * \brief return the active page

      * \return active page or NULL if there are no pages in the book

      */

-    wxWindow *GetCurrentPage();

+    wxWindow *GetCurrentPage() const;

 

     /**

      * \brief return page index by window pointer


-----------------------------------------------------------------------

Summary of changes:
 Plugin/gtk_notebook_ex.cpp |   13 ++++---------
 Plugin/gtk_notebook_ex.h   |   16 +++++-----------
 Plugin/notebook_ex.cpp     |    2 +-
 Plugin/notebook_ex.h       |    2 +-
 4 files changed, 11 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
codelite




2013	Jan	Feb	Mar	Apr (40)	May (42)	Jun (47)	Jul (60)	Aug (55)	Sep (83)	Oct (78)	Nov (40)	Dec (106)
2014	Jan (65)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

codelite-git Mailing List for CodeLite (Page 3)

CodeLite: an open source, cross platform C/C++/PHP and JavaScript IDE

codelite-git — Commit logs