wxMediaCtrl patch from Ryan:

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

diff --git a/demos/dbbrowse/tabpgwin.h b/demos/dbbrowse/tabpgwin.h
index e3f2ea61af5f2c5319084c73aef89d8009846725..51ec6dd6518f87cc251785d1204f8ca5edb829b8 100644 (file)
--- a/demos/dbbrowse/tabpgwin.h
+++ b/demos/dbbrowse/tabpgwin.h
@@ -1,28 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        No names yet.
+// Name:        tabpgwin.h
 // Purpose:     Contrib. demo
 // Author:      Aleksandras Gluchovas
-// Modified by: 19990908 : mj10777@gmx.net
+// Modified by: 19990908 : mj
 //              19990909 :
 //              - rename to tabpgwin
 //              - restruction of Variable declaration
 //              - to prevent Warnings under MingGW32
-// Modified by: 19990909 : mj10777@gmx.net
-//              - mNoVertScroll TRUE = no / FALSE = Original Code
-//                the Original Code Paints a Vertical Scroll in wxPaggedWindow
-//                which is not needed in this Version. Use TRUE for this.
+// Modified by: 19990909 : mj
+//              - 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.
 // Created:     07/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __CONTROLAREA_G__
-#define __CONTROLAREA_G__
+#ifndef __TABPGWIN_G__
+#define __TABPGWIN_G__
 
-#ifdef __GNUG__
-#pragma interface "controlarea.h"
-#endif
+//#ifdef __GNUG__
+//#pragma interface
+//#endif
 
 #include "wx/defs.h"
 #include "wx/window.h"
@@ -60,7 +60,7 @@ public:
 
  virtual wxFont GetLabelingFont();
 
- // FOR NOW:: scrollbars are actually related to wxPaggedWindow
+ // FOR NOW:: scrollbars are actually related to wxPagedWindow
 
  wxScrollBar* mpTabScroll;
  wxScrollBar* mpHorizScroll;
@@ -68,7 +68,7 @@ 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
@@ -83,13 +83,13 @@ public:
  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);
 
@@ -100,10 +100,10 @@ public:
  // 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),
@@ -112,7 +112,7 @@ public:
 
  virtual void AddTab( wxWindow* pContent,
                       wxString  tabText,
-                      wxBitmap* pImage = NULL );
+                      wxBitmap* pImage );
 
  virtual void RemoveTab( int tabNo );
 
@@ -135,7 +135,7 @@ public:
 
  // should be invoked to redisplay window with changed properties
 
- virtual void RecalcLayout( bool andRepaint = TRUE );
+ virtual void RecalcLayout( bool andRepaint = true );
 
  // event handlers
 
@@ -154,9 +154,9 @@ public:
  * of Microsoft Developer Studio 4.xx
  */
 
-class wxPaggedWindow : public wxTabbedWindow
+class wxPagedWindow : public wxTabbedWindow
 {
- DECLARE_DYNAMIC_CLASS( wxPaggedWindow )
+ DECLARE_DYNAMIC_CLASS( wxPagedWindow )
  // the protected: public: changes prevents Warnings in gcc
 protected:
  bool         mScrollEventInProgress;
@@ -180,7 +180,7 @@ public:
  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 );
@@ -199,8 +199,8 @@ public:
 
 
 public:
- wxPaggedWindow();
- ~wxPaggedWindow();
+ wxPagedWindow();
+ ~wxPagedWindow(){};
 
  // NOTE:: use public methods of the base class
  //        to add "pages" to this window
@@ -222,7 +222,7 @@ public:
 
  virtual int HitTest( const wxPoint& pos );
 
- virtual void RecalcLayout( bool andRepaint = TRUE );
+ virtual void RecalcLayout( bool andRepaint = true );
 
  // event handlers
 
@@ -243,7 +243,7 @@ class twTabInfo : public wxObject
  DECLARE_DYNAMIC_CLASS( twTabInfo )
 public:
  twTabInfo();
- ~twTabInfo();
+ ~twTabInfo(){};
 
  int ImgWidth();
  int ImgHeight();