a better compilation fix

[wxWidgets.git] / include / wx / aui / auibook.h

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index fb44a0628ea852779ea604971aa52ef6c0d89fc1..94d5bfef24e93eb0aa05584531bbaad7d7b8d8a2 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/aui/notebook.h
+// Name:        wx/aui/auibook.h

 // Purpose:     wxaui: wx advanced user interface - notebook
 // Author:      Benjamin I. Williams
 // Modified by:
 // Purpose:     wxaui: wx advanced user interface - notebook
 // Author:      Benjamin I. Williams
 // Modified by:


@@ -18,12 +18,116 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"

+
+#if wxUSE_AUI
+

 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 #include "wx/aui/floatpane.h"
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 #include "wx/aui/floatpane.h"

+#include "wx/control.h"

 
 
 
 

-#if wxUSE_AUI
+// tab art class
+
+
+class WXDLLIMPEXP_AUI wxTabArt
+{
+public:
+
+    wxTabArt() { }
+    virtual ~wxTabArt() { }
+    
+    virtual void SetNormalFont(const wxFont& font) = 0;
+    virtual void SetSelectedFont(const wxFont& font) = 0;
+    virtual void SetMeasuringFont(const wxFont& font) = 0;
+
+    virtual void DrawBackground(
+                         wxDC* dc,
+                         const wxRect& rect) = 0;
+
+    virtual void DrawTab(wxDC* dc,
+                         const wxRect& in_rect,
+                         const wxString& caption,
+                         bool active,
+                         wxRect* out_rect,
+                         int* x_extent) = 0;     
+    
+    virtual void DrawButton(
+                         wxDC* dc,
+                         const wxRect& in_rect,
+                         int bitmap_id,
+                         int button_state,
+                         int orientation,
+                         const wxBitmap& bitmap_override,
+                         wxRect* out_rect) = 0;
+                 
+    virtual wxSize GetTabSize(
+                         wxDC* dc,
+                         const wxString& caption,
+                         bool active,
+                         int* x_extent) = 0;
+                         
+    virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;      
+};
+
+
+class WXDLLIMPEXP_AUI wxDefaultTabArt : public wxTabArt
+{
+
+public:
+
+    wxDefaultTabArt();
+    virtual ~wxDefaultTabArt();
+    
+    void SetNormalFont(const wxFont& font);
+    void SetSelectedFont(const wxFont& font);
+    void SetMeasuringFont(const wxFont& font);
+    
+    void DrawBackground(
+                 wxDC* dc,
+                 const wxRect& rect);
+
+    void DrawTab(wxDC* dc,
+                 const wxRect& in_rect,
+                 const wxString& caption,
+                 bool active,
+                 wxRect* out_rect,
+                 int* x_extent);
+    
+    void DrawButton(
+                 wxDC* dc,
+                 const wxRect& in_rect,
+                 int bitmap_id,
+                 int button_state,
+                 int orientation,
+                 const wxBitmap& bitmap_override,
+                 wxRect* out_rect);
+    
+    wxSize GetTabSize(
+                 wxDC* dc,
+                 const wxString& caption,
+                 bool active,
+                 int* x_extent);
+    
+    int GetBestTabCtrlSize(wxWindow* wnd);
+
+private:
+
+    wxFont m_normal_font;
+    wxFont m_selected_font;
+    wxFont m_measuring_font;
+    wxPen m_normal_bkpen;
+    wxPen m_selected_bkpen;
+    wxBrush m_normal_bkbrush;
+    wxBrush m_selected_bkbrush;
+    wxBrush m_bkbrush;
+    wxBitmap m_active_close_bmp;
+    wxBitmap m_disabled_close_bmp;
+    wxBitmap m_active_left_bmp;
+    wxBitmap m_disabled_left_bmp;
+    wxBitmap m_active_right_bmp;
+    wxBitmap m_disabled_right_bmp;
+};

 
 
 
 
 
 


@@ -50,11 +154,11 @@ public:
     void SetOldSelection(int s) { old_selection = s; }
     int GetSelection() const { return selection; }
     int GetOldSelection() const { return old_selection; }
     void SetOldSelection(int s) { old_selection = s; }
     int GetSelection() const { return selection; }
     int GetOldSelection() const { return old_selection; }

-    
+

 public:
     int old_selection;
     int selection;
 public:
     int old_selection;
     int selection;

-    
+

 #ifndef SWIG
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent)
 #ifndef SWIG
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent)


@@ -79,15 +183,18 @@ class WXDLLIMPEXP_AUI wxAuiTabContainerButton
 {
 public:
     int id;               // button's id
 {
 public:
     int id;               // button's id

-    int cur_state;        // current state (normal, hover, pressed)
-    wxBitmap bitmap;      // button's bitmap
+    int cur_state;        // current state (normal, hover, pressed, etc.)
+    int location;         // buttons location (wxLEFT or wxRIGHT)
+    wxBitmap bitmap;      // button's hover bitmap
+    wxBitmap dis_bitmap;  // button's disabled bitmap

     wxRect rect;          // button's hit rectangle
 };
 
 
     wxRect rect;          // button's hit rectangle
 };
 
 

+#ifndef SWIG

 WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiNotebookPage, wxAuiNotebookPageArray, WXDLLIMPEXP_AUI);
 WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButtonArray, WXDLLIMPEXP_AUI);
 WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiNotebookPage, wxAuiNotebookPageArray, WXDLLIMPEXP_AUI);
 WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButtonArray, WXDLLIMPEXP_AUI);

-
+#endif

 
 
 class WXDLLIMPEXP_AUI wxAuiTabContainer
 
 
 class WXDLLIMPEXP_AUI wxAuiTabContainer


@@ -97,6 +204,9 @@ public:
     wxAuiTabContainer();
     virtual ~wxAuiTabContainer();
 
     wxAuiTabContainer();
     virtual ~wxAuiTabContainer();
 

+    void SetArtProvider(wxTabArt* art);
+    wxTabArt* GetArtProvider();
+

     bool AddPage(wxWindow* page, const wxAuiNotebookPage& info);
     bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx);
     bool RemovePage(wxWindow* page);
     bool AddPage(wxWindow* page, const wxAuiNotebookPage& info);
     bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx);
     bool RemovePage(wxWindow* page);


@@ -116,31 +226,25 @@ public:
     void SetMeasuringFont(const wxFont& measuring_font);
     void DoShowHide();
     void SetRect(const wxRect& rect);
     void SetMeasuringFont(const wxFont& measuring_font);
     void DoShowHide();
     void SetRect(const wxRect& rect);

-    void AddButton(int id, const wxBitmap& bmp);
+    void AddButton(int id,
+                   int location,
+                   const wxBitmap& normal_bitmap = wxNullBitmap,
+                   const wxBitmap& disabled_bitmap = wxNullBitmap);
+
+    size_t GetTabOffset() const;
+    void SetTabOffset(size_t offset);

     
 protected:
 
     
 protected:
 

-    virtual void Render(wxDC* dc);   
+    virtual void Render(wxDC* dc);

 
 

-    virtual void DrawTab(wxDC* dc,
-                         const wxRect& in_rect,
-                         const wxString& caption,
-                         bool active,
-                         wxRect* out_rect,
-                         int* x_extent); 

 private:
 
 private:
 

+    wxTabArt* m_art;

     wxAuiNotebookPageArray m_pages;
     wxAuiTabContainerButtonArray m_buttons;
     wxRect m_rect;
     wxAuiNotebookPageArray m_pages;
     wxAuiTabContainerButtonArray m_buttons;
     wxRect m_rect;

-    wxFont m_normal_font;
-    wxFont m_selected_font;
-    wxFont m_measuring_font;
-    wxPen m_normal_bkpen;
-    wxPen m_selected_bkpen;
-    wxBrush m_normal_bkbrush;
-    wxBrush m_selected_bkbrush;
-    wxBrush m_bkbrush;
+    size_t m_tab_offset;

 };
 
 
 };
 
 


@@ -151,11 +255,11 @@ class WXDLLIMPEXP_AUI wxAuiTabCtrl : public wxControl,
 public:
 
     wxAuiTabCtrl(wxWindow* parent,
 public:
 
     wxAuiTabCtrl(wxWindow* parent,

-                 wxWindowID id,
+                 wxWindowID id = wxID_ANY,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0);
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0);

-                 
+

 protected:
 
     void OnPaint(wxPaintEvent& evt);
 protected:
 
     void OnPaint(wxPaintEvent& evt);


@@ -165,15 +269,19 @@ protected:
     void OnLeftUp(wxMouseEvent& evt);
     void OnMotion(wxMouseEvent& evt);
     void OnLeaveWindow(wxMouseEvent& evt);
     void OnLeftUp(wxMouseEvent& evt);
     void OnMotion(wxMouseEvent& evt);
     void OnLeaveWindow(wxMouseEvent& evt);

+    void OnButton(wxAuiNotebookEvent& evt);
+

     
 protected:
     
 protected:

-    
+

     wxPoint m_click_pt;
     int m_click_tab;
     bool m_is_dragging;
     wxAuiTabContainerButton* m_hover_button;
 
     wxPoint m_click_pt;
     int m_click_tab;
     bool m_is_dragging;
     wxAuiTabContainerButton* m_hover_button;
 

+#ifndef SWIG

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+#endif

 };
 
 
 };
 
 


@@ -185,54 +293,57 @@ class WXDLLIMPEXP_AUI wxAuiMultiNotebook : public wxControl
 public:
 
     wxAuiMultiNotebook();
 public:
 
     wxAuiMultiNotebook();

-    
+

     wxAuiMultiNotebook(wxWindow* parent,
     wxAuiMultiNotebook(wxWindow* parent,

-                       wxWindowID id,
+                       wxWindowID id = wxID_ANY,

                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = 0);
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = 0);

-                       
+

     virtual ~wxAuiMultiNotebook();
 
     bool Create(wxWindow* parent,
     virtual ~wxAuiMultiNotebook();
 
     bool Create(wxWindow* parent,

-                wxWindowID id,
+                wxWindowID id = wxID_ANY,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = 0);            
+                long style = 0);

 
     bool AddPage(wxWindow* page,
                  const wxString& caption,
                  bool select = false,
                  const wxBitmap& bitmap = wxNullBitmap);
 
     bool AddPage(wxWindow* page,
                  const wxString& caption,
                  bool select = false,
                  const wxBitmap& bitmap = wxNullBitmap);

-                
+

     bool InsertPage(size_t page_idx,
                     wxWindow* page,
                     const wxString& caption,
                     bool select = false,
                     const wxBitmap& bitmap = wxNullBitmap);
     bool InsertPage(size_t page_idx,
                     wxWindow* page,
                     const wxString& caption,
                     bool select = false,
                     const wxBitmap& bitmap = wxNullBitmap);

-                    
+

     bool DeletePage(size_t page);
     bool RemovePage(size_t page);
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);

-    
+

     bool SetPageText(size_t page, const wxString& text);
     size_t SetSelection(size_t new_page);
     int GetSelection() const;
     size_t GetPageCount() const;
     wxWindow* GetPage(size_t page_idx) const;
     bool SetPageText(size_t page, const wxString& text);
     size_t SetSelection(size_t new_page);
     int GetSelection() const;
     size_t GetPageCount() const;
     wxWindow* GetPage(size_t page_idx) const;

-    
+
+    void SetArtProvider(wxTabArt* art);
+    wxTabArt* GetArtProvider();
+

 protected:
 protected:

-    
+

     wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt);
     wxWindow* GetTabFrameFromTabCtrl(wxWindow* tab_ctrl);
     wxAuiTabCtrl* GetActiveTabCtrl();
     bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx);
     void RemoveEmptyTabFrames();
     wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt);
     wxWindow* GetTabFrameFromTabCtrl(wxWindow* tab_ctrl);
     wxAuiTabCtrl* GetActiveTabCtrl();
     bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx);
     void RemoveEmptyTabFrames();

-    
+

 protected:
 
     void DoSizing();
     void InitNotebook();
 protected:
 
     void DoSizing();
     void InitNotebook();

-    
+

     void OnChildFocus(wxChildFocusEvent& evt);
     void OnRender(wxFrameManagerEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
     void OnChildFocus(wxChildFocusEvent& evt);
     void OnRender(wxFrameManagerEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);


@@ -242,7 +353,7 @@ protected:
     void OnTabDragMotion(wxCommandEvent& evt);
     void OnTabEndDrag(wxCommandEvent& evt);
     void OnTabButton(wxCommandEvent& evt);
     void OnTabDragMotion(wxCommandEvent& evt);
     void OnTabEndDrag(wxCommandEvent& evt);
     void OnTabButton(wxCommandEvent& evt);

-
+    

 protected:
 
     wxFrameManager m_mgr;
 protected:
 
     wxFrameManager m_mgr;


@@ -250,11 +361,14 @@ protected:
     int m_curpage;
     int m_tab_id_counter;
     wxWindow* m_dummy_wnd;
     int m_curpage;
     int m_tab_id_counter;
     wxWindow* m_dummy_wnd;

-    
+

     wxFont m_selected_font;
     wxFont m_normal_font;
     wxFont m_selected_font;
     wxFont m_normal_font;

-    
+    int m_tab_ctrl_height;
+
+#ifndef SWIG

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+#endif

 };
 
 
 };
 
 


@@ -282,7 +396,7 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn))
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn))

-#define EVT_AUINOTEBOOK_PAGE_BUTTON(winid, fn) \
+#define EVT_AUINOTEBOOK_BUTTON(winid, fn) \

     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn))
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn))


@@ -290,12 +404,25 @@ typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_DRAG_MOTION(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, winid, wxAuiNotebookEventHandler(fn))
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_DRAG_MOTION(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, winid, wxAuiNotebookEventHandler(fn))

-    
+

 #else
 
 // wxpython/swig event work
 #else
 
 // wxpython/swig event work

-
-
+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED;
+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING;
+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_BUTTON;
+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG;
+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_END_DRAG;
+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION;
+
+%pythoncode {
+    EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 1 )
+    EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 1 )
+    EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 1 )
+    EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 1 )
+    EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 1 )
+    EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 1 )
+}

 #endif
 
 
 #endif