using new API (no visual difference)

[wxWidgets.git] / src / generic / notebook.cpp

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index ec05ba70b4f967934ca7f60f86bcf3e5c9657ec2..6b6b84c79a9a62704f856ecf3274d880ec74e141 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        notebook.cpp
-// Purpose:     implementation of wxNotebook
+// Name:        src/generic/notebook.cpp
+// Purpose:     generic implementation of wxNotebook

 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "notebook.h"
-#endif
-

 #ifdef __VMS
 #pragma message disable unscomzer
 #endif
 #ifdef __VMS
 #pragma message disable unscomzer
 #endif


@@ -47,7 +43,7 @@
 // ----------------------------------------------------------------------------
 
 // check that the page index is valid
 // ----------------------------------------------------------------------------
 
 // check that the page index is valid

-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())

 
 // ----------------------------------------------------------------------------
 // event table
 
 // ----------------------------------------------------------------------------
 // event table


@@ -211,7 +207,7 @@ wxString wxNotebook::GetPageText(size_t nPage) const
         return wxEmptyString;
 }
 
         return wxEmptyString;
 }
 

-int wxNotebook::GetPageImage(size_t nPage) const
+int wxNotebook::GetPageImage(size_t WXUNUSED_UNLESS_DEBUG(nPage)) const

 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 


@@ -219,7 +215,8 @@ int wxNotebook::GetPageImage(size_t nPage) const
     return 0;
 }
 
     return 0;
 }
 

-bool wxNotebook::SetPageImage(size_t nPage, int nImage)
+bool wxNotebook::SetPageImage(size_t WXUNUSED_UNLESS_DEBUG(nPage),
+                              int WXUNUSED(nImage))

 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 


@@ -228,19 +225,19 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 }
 
 // set the size (the same for all pages)
 }
 
 // set the size (the same for all pages)

-void wxNotebook::SetPageSize(const wxSize& size)
+void wxNotebook::SetPageSize(const wxSize& WXUNUSED(size))

 {
     // TODO
 }
 
 // set the padding between tabs (in pixels)
 {
     // TODO
 }
 
 // set the padding between tabs (in pixels)

-void wxNotebook::SetPadding(const wxSize& padding)
+void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding))

 {
     // TODO
 }
 
 // set the size of the tabs for wxNB_FIXEDWIDTH controls
 {
     // TODO
 }
 
 // set the size of the tabs for wxNB_FIXEDWIDTH controls

-void wxNotebook::SetTabSize(const wxSize& sz)
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -385,7 +382,7 @@ bool wxNotebook::InsertPage(size_t nPage,
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect,
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect,

-                            int imageId)
+                            int WXUNUSED(imageId))

 {
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false );
 {
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false );