// - 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
-// 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
#ifndef __TABPGWIN_G__
#define __TABPGWIN_G__
-//#ifdef __GNUG__
-//#pragma interface
-//#endif
-
#include "wx/defs.h"
#include "wx/window.h"
#include "wx/string.h"
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
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)
- 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 AddTab( wxWindow* pContent, // contained window
wxString tabText, // tab label
- wxString imageFileName = "", // if "", only text label is displayed
+ wxString imageFileName = _T(""), // if "", only text label is displayed
wxBitmapType imageType = wxBITMAP_TYPE_BMP );
// NOTE:: if this AddTab(..) overload is called, the
virtual void AddTab( wxWindow* pContent,
wxString tabText,
- wxBitmap* pImage = NULL );
+ wxBitmap* pImage );
virtual void RemoveTab( int tabNo );
// should be invoked to redisplay window with changed properties
- virtual void RecalcLayout( bool andRepaint = TRUE );
+ virtual void RecalcLayout( bool andRepaint = true );
// event handlers
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 );
public:
wxPagedWindow();
- ~wxPagedWindow();
+ ~wxPagedWindow(){};
// NOTE:: use public methods of the base class
// to add "pages" to this window
virtual int HitTest( const wxPoint& pos );
- virtual void RecalcLayout( bool andRepaint = TRUE );
+ virtual void RecalcLayout( bool andRepaint = true );
// event handlers
DECLARE_DYNAMIC_CLASS( twTabInfo )
public:
twTabInfo();
- ~twTabInfo();
+ ~twTabInfo(){};
int ImgWidth();
int ImgHeight();