Fix after removal of PRIOR/NEXT in common headers (duplicates change in GTK2 sources).

[wxWidgets.git] / demos / dbbrowse / tabpgwin.h

diff --git a/demos/dbbrowse/tabpgwin.h b/demos/dbbrowse/tabpgwin.h
index 20d6163fc2fecb0d600c3e6706e7ebcd4f1ff22c..5be9b27086474d47b3968d6b96374681a1f09abe 100644 (file)
--- a/demos/dbbrowse/tabpgwin.h
+++ b/demos/dbbrowse/tabpgwin.h
@@ -8,9 +8,9 @@
 //              - restruction of Variable declaration
 //              - to prevent Warnings under MingGW32
 // Modified by: 19990909 : mj
 //              - restruction of Variable declaration
 //              - to prevent Warnings under MingGW32
 // Modified by: 19990909 : mj

-//              - mNoVertScroll TRUE = no / FALSE = Original Code
+//              - mNoVertScroll true = no / false = Original Code

 //                the Original Code Paints a Vertical Scroll in wxPagedWindow
 //                the Original Code Paints a Vertical Scroll in wxPagedWindow

-//                which is not needed in this Version. Use TRUE for this.
+//                which is not needed in this Version. Use true for this.

 // Created:     07/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Created:     07/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas


@@ -20,10 +20,6 @@
 #ifndef __TABPGWIN_G__
 #define __TABPGWIN_G__
 
 #ifndef __TABPGWIN_G__
 #define __TABPGWIN_G__
 

-//#ifdef __GNUG__
-//#pragma interface
-//#endif
-

 #include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/string.h"


@@ -68,7 +64,7 @@ public:
 
 public:
 
 
 public:
 

- // public properties (invoke ReclaclLayout(TRUE) to apply changes)
+ // public properties (invoke ReclaclLayout(true) to apply changes)

 
  int    mVertGap;         // default: 3
  int    mHorizGap;        // default: 5
 
  int    mVertGap;         // default: 3
  int    mHorizGap;        // default: 5


@@ -83,13 +79,13 @@ public:
  wxPen  mDarkPen;         // default: RGB(128,128,128)
  wxPen  mBlackPen;        // default: RGB(  0,  0,  0)
 
  wxPen  mDarkPen;         // default: RGB(128,128,128)
  wxPen  mBlackPen;        // default: RGB(  0,  0,  0)
 

- int    mActiveTab;
+ size_t mActiveTab;

  int    mTitleHeight;
  int    mLayoutType;
 
  // notifications (can be handled by derivatives)
 
  int    mTitleHeight;
  int    mLayoutType;
 
  // notifications (can be handled by derivatives)
 

- virtual void OnTabAdded( twTabInfo* pInfo ) {}
+ virtual void OnTabAdded( twTabInfo* WXUNUSED(pInfo) ) {}

 
  virtual void SizeTabs(int x,int y, int width, int height, bool repant);
 
 
  virtual void SizeTabs(int x,int y, int width, int height, bool repant);
 


@@ -100,10 +96,10 @@ public:
  // tabs can be also added when the window is
  // already displayed - "on the fly"
 
  // tabs can be also added when the window is
  // already displayed - "on the fly"
 

- virtual void AddTab( wxWindow* pContent,           // contained window
-                      wxString  tabText,            // tab label
-                      wxString  imageFileName = "", // if "", only text label is displayed
-                      long      imageType     = wxBITMAP_TYPE_BMP );
+ virtual void AddTab( wxWindow*    pContent,           // contained window
+                      wxString     tabText,            // tab label
+                      wxString     imageFileName = _T(""), // if "", only text label is displayed
+                      wxBitmapType imageType     = wxBITMAP_TYPE_BMP );

 
  // NOTE:: if this AddTab(..) overload is called, the
  //        image bitmap will not be serialized (if performed),
 
  // NOTE:: if this AddTab(..) overload is called, the
  //        image bitmap will not be serialized (if performed),


@@ -112,7 +108,7 @@ public:
 
  virtual void AddTab( wxWindow* pContent,
                       wxString  tabText,
 
  virtual void AddTab( wxWindow* pContent,
                       wxString  tabText,

-                      wxBitmap* pImage = NULL );
+                      wxBitmap* pImage );

 
  virtual void RemoveTab( int tabNo );
 
 
  virtual void RemoveTab( int tabNo );
 


@@ -135,7 +131,7 @@ public:
 
  // should be invoked to redisplay window with changed properties
 
 
  // should be invoked to redisplay window with changed properties
 

- virtual void RecalcLayout( bool andRepaint = TRUE );
+ virtual void RecalcLayout( bool andRepaint = true );

 
  // event handlers
 
 
  // event handlers
 


@@ -180,7 +176,7 @@ public:
  int          mTitleRowStart;
  int          mResizeNailGap;
  int          mTitleRowLen;               // actual title row length
  int          mTitleRowStart;
  int          mResizeNailGap;
  int          mTitleRowLen;               // actual title row length

- int          mNoVertScroll;              // No Vertical Scroll  TRUE/FALSE
+ int          mNoVertScroll;              // No Vertical Scroll  true/false

 
  void DrawPaperBar( twTabInfo& tab, int x, int y,
                                     wxBrush& brush, wxPen& pen, wxDC& dc );
 
  void DrawPaperBar( twTabInfo& tab, int x, int y,
                                     wxBrush& brush, wxPen& pen, wxDC& dc );


@@ -200,7 +196,7 @@ public:
 
 public:
  wxPagedWindow();
 
 public:
  wxPagedWindow();

- ~wxPagedWindow();
+ ~wxPagedWindow(){};

 
  // NOTE:: use public methods of the base class
  //        to add "pages" to this window
 
  // NOTE:: use public methods of the base class
  //        to add "pages" to this window


@@ -222,7 +218,7 @@ public:
 
  virtual int HitTest( const wxPoint& pos );
 
 
  virtual int HitTest( const wxPoint& pos );
 

- virtual void RecalcLayout( bool andRepaint = TRUE );
+ virtual void RecalcLayout( bool andRepaint = true );

 
  // event handlers
 
 
  // event handlers
 


@@ -243,7 +239,7 @@ class twTabInfo : public wxObject
  DECLARE_DYNAMIC_CLASS( twTabInfo )
 public:
  twTabInfo();
  DECLARE_DYNAMIC_CLASS( twTabInfo )
 public:
  twTabInfo();

- ~twTabInfo();
+ ~twTabInfo(){};

 
  int ImgWidth();
  int ImgHeight();
 
  int ImgWidth();
  int ImgHeight();