signned/unsigned fix

[wxWidgets.git] / include / wx / msw / notebook.h

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 51b4b0bb82c507c1fad715b8a66ea86842f9d91f..142803edcc095ff65bb8e8025c20f5b5f6779f12 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -48,8 +48,6 @@ public:
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");

-    // dtor
-  ~wxNotebook();

 
   // accessors
   // ---------
 
   // accessors
   // ---------


@@ -74,7 +72,6 @@ public:
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);

-  void AssignImageList(wxImageList* imageList);

 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;
 
     // sets/returns item's image index in the current image list
   int  GetPageImage(int nPage) const;


@@ -123,6 +120,8 @@ public:
   // base class virtuals
   // -------------------
   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
   // base class virtuals
   // -------------------
   virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

+  virtual bool MSWOnScroll(int orientation, WXWORD nSBCode,
+                           WXWORD pos, WXHWND control);

   virtual void SetConstraintSizes(bool recurse = TRUE);
   virtual bool DoPhase(int nPhase);
 
   virtual void SetConstraintSizes(bool recurse = TRUE);
   virtual bool DoPhase(int nPhase);
 


@@ -130,14 +129,15 @@ protected:
   // common part of all ctors
   void Init();
 
   // common part of all ctors
   void Init();
 

+  // translate wxWin styles to the Windows ones
+  virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+

   // remove one page from the notebook, without deleting
   virtual wxNotebookPage *DoRemovePage(int nPage);
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 
   // remove one page from the notebook, without deleting
   virtual wxNotebookPage *DoRemovePage(int nPage);
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 

-  bool m_bOwnsImageList;
-

   int m_nSelection;           // the current selection (-1 if none)
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
   int m_nSelection;           // the current selection (-1 if none)
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)