Updated translations manual page with latest status given by the website translations...

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

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index ffc19b1f77c553dd7c83aa20325d4984f8abb036..dda002abc905d33a3636f31dcdec8c8d6f002c01 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -12,13 +12,9 @@
 #ifndef _WX_UNIV_NOTEBOOK_H_
 #define _WX_UNIV_NOTEBOOK_H_
 
 #ifndef _WX_UNIV_NOTEBOOK_H_
 #define _WX_UNIV_NOTEBOOK_H_
 

-#ifdef __GNUG__
-    #pragma interface "univnotebook.h"
-#endif
-

 #include "wx/arrstr.h"
 
 #include "wx/arrstr.h"
 

-class WXDLLEXPORT wxSpinButton;
+class WXDLLIMPEXP_FWD_CORE wxSpinButton;

 
 // ----------------------------------------------------------------------------
 // the actions supported by this control
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control


@@ -33,7 +29,7 @@ class WXDLLEXPORT wxSpinButton;
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -46,7 +42,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,

-               const wxString& name = wxNOTEBOOK_NAME)
+               const wxString& name = wxNotebookNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -59,7 +55,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,

-                const wxString& name = wxNOTEBOOK_NAME);
+                const wxString& name = wxNotebookNameStr);

 
     // dtor
     virtual ~wxNotebook();
 
     // dtor
     virtual ~wxNotebook();


@@ -67,14 +63,17 @@ public:
     // implement wxNotebookBase pure virtuals
     // --------------------------------------
 
     // implement wxNotebookBase pure virtuals
     // --------------------------------------
 

-    virtual int SetSelection(int nPage);
-    virtual int GetSelection() const { return m_sel; }
+    virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
+    virtual int GetSelection() const { return (int) m_sel; }
+
+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }

 
 

-    virtual bool SetPageText(int nPage, const wxString& strText);
-    virtual wxString GetPageText(int nPage) const;
+    virtual bool SetPageText(size_t nPage, const wxString& strText);
+    virtual wxString GetPageText(size_t nPage) const;

 
 

-    virtual int GetPageImage(int nPage) const;
-    virtual bool SetPageImage(int nPage, int nImage);
+    virtual int GetPageImage(size_t nPage) const;
+    virtual bool SetPageImage(size_t nPage, int nImage);

 
     virtual void SetPageSize(const wxSize& size);
     virtual void SetPadding(const wxSize& padding);
 
     virtual void SetPageSize(const wxSize& size);
     virtual void SetPadding(const wxSize& padding);


@@ -84,23 +83,22 @@ public:
 
     virtual bool DeleteAllPages();
 
 
     virtual bool DeleteAllPages();
 

-    virtual bool InsertPage(int nPage,
+    virtual bool InsertPage(size_t nPage,

                             wxNotebookPage *pPage,
                             const wxString& strText,
                             wxNotebookPage *pPage,
                             const wxString& strText,

-                            bool bSelect = FALSE,
+                            bool bSelect = false,

                             int imageId = -1);
 
     // style tests
     // -----------
 
                             int imageId = -1);
 
     // style tests
     // -----------
 

-    // return TRUE if all tabs have the same width
-    bool FixedSizeTabs() const
-        { return GetWindowStyle() & wxNB_FIXEDWIDTH != 0; }
+    // return true if all tabs have the same width
+    bool FixedSizeTabs() const { return HasFlag(wxNB_FIXEDWIDTH); }

 
     // return wxTOP/wxBOTTOM/wxRIGHT/wxLEFT
     wxDirection GetTabOrientation() const;
 
 
     // return wxTOP/wxBOTTOM/wxRIGHT/wxLEFT
     wxDirection GetTabOrientation() const;
 

-    // return TRUE if the notebook has tabs at the sidesand not at the top (or
+    // return true if the notebook has tabs at the sidesand not at the top (or

     // bottom) as usual
     bool IsVertical() const;
 
     // bottom) as usual
     bool IsVertical() const;
 


@@ -116,11 +114,17 @@ public:
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 

+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+

     // refresh the currently selected tab
     void RefreshCurrent();
 
 protected:
     // refresh the currently selected tab
     void RefreshCurrent();
 
 protected:

-    virtual wxNotebookPage *DoRemovePage(int nPage);
+    virtual wxNotebookPage *DoRemovePage(size_t nPage);

 
     // drawing
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // drawing
     virtual void DoDraw(wxControlRenderer *renderer);


@@ -133,6 +137,8 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

+    int DoSetSelection(size_t nPage, int flags = 0);
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 


@@ -156,7 +162,7 @@ protected:
     void PositionSpinBtn();
 
     // refresh the given tab only
     void PositionSpinBtn();
 
     // refresh the given tab only

-    void RefreshTab(int page, bool forceSelected = FALSE);
+    void RefreshTab(int page, bool forceSelected = false);

 
     // refresh all tabs
     void RefreshAllTabs();
 
     // refresh all tabs
     void RefreshAllTabs();


@@ -181,7 +187,7 @@ protected:
     wxCoord GetTabWidth(int page) const
         { return FixedSizeTabs() ? m_widthMax : m_widths[page]; }
 
     wxCoord GetTabWidth(int page) const
         { return FixedSizeTabs() ? m_widthMax : m_widths[page]; }
 

-    // return TRUE if the tab has an associated image
+    // return true if the tab has an associated image

     bool HasImage(int page) const
         { return m_imageList && m_images[page] != -1; }
 
     bool HasImage(int page) const
         { return m_imageList && m_images[page] != -1; }
 


@@ -247,28 +253,5 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxNotebook)
 };
 
     DECLARE_DYNAMIC_CLASS(wxNotebook)
 };
 

-// ----------------------------------------------------------------------------
-// wxStdNotebookInputHandler: translates SPACE and ENTER keys and the left mouse
-// click into button press/release actions
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStdNotebookInputHandler : public wxStdInputHandler
-{
-public:
-    wxStdNotebookInputHandler(wxInputHandler *inphand);
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
-    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
-
-protected:
-    void HandleFocusChange(wxInputConsumer *consumer);
-};
-

 #endif // _WX_UNIV_NOTEBOOK_H_
 
 #endif // _WX_UNIV_NOTEBOOK_H_