fixes for the dummy classes (used when wxUSE_GRAPHICS_CONTEXT is 0)

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

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index 438887920b1d582a0a67f41d85fd063856f8af49..0dd02f4644f85e654300b5ee8aff1757189110bb 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -27,89 +27,241 @@
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 
 

-// tab art class
+class wxAuiNotebook;
+

 
 

+enum wxAuiNotebookOption
+{
+    wxAUI_NB_TOP                 = 1 << 0,
+    wxAUI_NB_LEFT                = 1 << 1,  // not implemented yet
+    wxAUI_NB_RIGHT               = 1 << 2,  // not implemented yet
+    wxAUI_NB_BOTTOM              = 1 << 3,  // not implemented yet
+    wxAUI_NB_TAB_SPLIT           = 1 << 4,
+    wxAUI_NB_TAB_MOVE            = 1 << 5,
+    wxAUI_NB_TAB_EXTERNAL_MOVE   = 1 << 6,
+    wxAUI_NB_TAB_FIXED_WIDTH     = 1 << 7,
+    wxAUI_NB_SCROLL_BUTTONS      = 1 << 8,
+    wxAUI_NB_WINDOWLIST_BUTTON   = 1 << 9,
+    wxAUI_NB_CLOSE_BUTTON        = 1 << 10,
+    wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 11,
+    wxAUI_NB_CLOSE_ON_ALL_TABS   = 1 << 12,
+    
+    
+    wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP |
+                             wxAUI_NB_TAB_SPLIT |
+                             wxAUI_NB_TAB_MOVE |
+                             wxAUI_NB_SCROLL_BUTTONS |
+                             wxAUI_NB_CLOSE_ON_ACTIVE_TAB
+};
+
+
+
+
+// tab art class

 
 

-class WXDLLIMPEXP_AUI wxTabArt
+class WXDLLIMPEXP_AUI wxAuiTabArt

 {
 public:
 
 {
 public:
 

-    wxTabArt() { }
-    virtual ~wxTabArt() { }
+    wxAuiTabArt() { }
+    virtual ~wxAuiTabArt() { }

     
     

+    virtual wxAuiTabArt* Clone() = 0;
+    virtual void SetFlags(unsigned int flags) = 0;
+
+    virtual void SetSizingInfo(const wxSize& tab_ctrl_size,
+                               size_t tab_count) = 0;
+                               

     virtual void SetNormalFont(const wxFont& font) = 0;
     virtual void SetSelectedFont(const wxFont& font) = 0;
     virtual void SetMeasuringFont(const wxFont& font) = 0;
 
     virtual void DrawBackground(
     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,
+                         wxDC& dc,
+                         wxWindow* wnd,

                          const wxRect& rect) = 0;
 
                          const wxRect& rect) = 0;
 

-    virtual void DrawTab(wxDC* dc,
+    virtual void DrawTab(wxDC& dc,
+                         wxWindow* wnd,

                          const wxRect& in_rect,
                          const wxString& caption,
                          bool active,
                          const wxRect& in_rect,
                          const wxString& caption,
                          bool active,

-                         wxRect* out_rect,
+                         int close_button_state,
+                         wxRect* out_tab_rect,
+                         wxRect* out_button_rect,

                          int* x_extent) = 0;     
     
     virtual void DrawButton(
                          int* x_extent) = 0;     
     
     virtual void DrawButton(

-                         wxDC* dc,
+                         wxDC& dc,
+                         wxWindow* wnd,

                          const wxRect& in_rect,
                          int bitmap_id,
                          int button_state,
                          int orientation,
                          const wxBitmap& bitmap_override,
                          wxRect* out_rect) = 0;
                          const wxRect& in_rect,
                          int bitmap_id,
                          int button_state,
                          int orientation,
                          const wxBitmap& bitmap_override,
                          wxRect* out_rect) = 0;

-                 
+               
+    virtual int GetIndentSize() = 0;
+  

     virtual wxSize GetTabSize(
     virtual wxSize GetTabSize(

-                         wxDC* dc,
+                         wxDC& dc,
+                         wxWindow* wnd,

                          const wxString& caption,
                          bool active,
                          const wxString& caption,
                          bool active,

+                         int close_button_state,

                          int* x_extent) = 0;
                          
                          int* x_extent) = 0;
                          

-    virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;      
+    virtual int ShowWindowList(
+                         wxWindow* wnd,
+                         const wxArrayString& items,
+                         int active_idx) = 0;
+    
+    virtual int GetBestTabCtrlSize(wxWindow* wnd) = 0;    

 };
 
 
 };
 
 

-class WXDLLIMPEXP_AUI wxDefaultTabArt : public wxTabArt
+class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt

 {
 
 public:
 
 {
 
 public:
 

-    wxDefaultTabArt();
-    virtual ~wxDefaultTabArt();
+    wxAuiSimpleTabArt();
+    virtual ~wxAuiSimpleTabArt();

     
     

+    wxAuiTabArt* Clone();
+    void SetFlags(unsigned int flags);
+
+    void SetSizingInfo(const wxSize& tab_ctrl_size,
+                       size_t tab_count);
+

     void SetNormalFont(const wxFont& font);
     void SetSelectedFont(const wxFont& font);
     void SetMeasuringFont(const wxFont& font);
     void SetNormalFont(const wxFont& font);
     void SetSelectedFont(const wxFont& font);
     void SetMeasuringFont(const wxFont& font);

-    
+

     void DrawBackground(
     void DrawBackground(

-                 wxDC* dc,
+                 wxDC& dc,
+                 wxWindow* wnd,

                  const wxRect& rect);
                  const wxRect& rect);

-
-    void DrawTab(wxDC* dc,
+                                          
+    void DrawTab(wxDC& dc,
+                 wxWindow* wnd,

                  const wxRect& in_rect,
                  const wxString& caption,
                  bool active,
                  const wxRect& in_rect,
                  const wxString& caption,
                  bool active,

-                 wxRect* out_rect,
+                 int close_button_state,
+                 wxRect* out_tab_rect,
+                 wxRect* out_button_rect,

                  int* x_extent);
     
     void DrawButton(
                  int* x_extent);
     
     void DrawButton(

-                 wxDC* dc,
+                 wxDC& dc,
+                 wxWindow* wnd,

                  const wxRect& in_rect,
                  int bitmap_id,
                  int button_state,
                  int orientation,
                  const wxBitmap& bitmap_override,
                  wxRect* out_rect);
                  const wxRect& in_rect,
                  int bitmap_id,
                  int button_state,
                  int orientation,
                  const wxBitmap& bitmap_override,
                  wxRect* out_rect);

+             
+    int GetIndentSize();

     
     wxSize GetTabSize(
     
     wxSize GetTabSize(

-                 wxDC* dc,
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxString& caption,
+                 bool active,
+                 int close_button_state,
+                 int* x_extent);
+                  
+    int ShowWindowList(
+                 wxWindow* wnd,
+                 const wxArrayString& items,
+                 int active_idx);
+
+    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;
+    wxBitmap m_active_windowlist_bmp;
+    wxBitmap m_disabled_windowlist_bmp;
+    
+    int m_fixed_tab_width;
+    unsigned int m_flags;
+};
+
+
+class WXDLLIMPEXP_AUI wxAuiDefaultTabArt : public wxAuiTabArt
+{
+
+public:
+
+    wxAuiDefaultTabArt();
+    virtual ~wxAuiDefaultTabArt();
+    
+    wxAuiTabArt* Clone();
+    void SetFlags(unsigned int flags);
+    void SetSizingInfo(const wxSize& tab_ctrl_size,
+                       size_t tab_count);
+
+    void SetNormalFont(const wxFont& font);
+    void SetSelectedFont(const wxFont& font);
+    void SetMeasuringFont(const wxFont& font);
+
+    void DrawBackground(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& rect);
+                     
+    void DrawTab(wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& in_rect,

                  const wxString& caption,
                  bool active,
                  const wxString& caption,
                  bool active,

+                 int close_button_state,
+                 wxRect* out_tab_rect,
+                 wxRect* out_button_rect,

                  int* x_extent);
     
                  int* x_extent);
     

-    int GetBestTabCtrlSize(wxWindow* wnd);
+    void DrawButton(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxRect& in_rect,
+                 int bitmap_id,
+                 int button_state,
+                 int orientation,
+                 const wxBitmap& bitmap_override,
+                 wxRect* out_rect);
+    
+    int GetIndentSize();
+                 
+    wxSize GetTabSize(
+                 wxDC& dc,
+                 wxWindow* wnd,
+                 const wxString& caption,
+                 bool active,
+                 int close_button_state,
+                 int* x_extent);
+                  
+    int ShowWindowList(
+                 wxWindow* wnd,
+                 const wxArrayString& items,
+                 int active_idx);
+
+    int GetBestTabCtrlSize(wxWindow* wnd);    

 
 private:
 
 
 private:
 


@@ -127,10 +279,16 @@ private:
     wxBitmap m_disabled_left_bmp;
     wxBitmap m_active_right_bmp;
     wxBitmap m_disabled_right_bmp;
     wxBitmap m_disabled_left_bmp;
     wxBitmap m_active_right_bmp;
     wxBitmap m_disabled_right_bmp;

+    wxBitmap m_active_windowlist_bmp;
+    wxBitmap m_disabled_windowlist_bmp;
+    
+    int m_fixed_tab_width;
+    unsigned int m_flags;

 };
 
 
 
 };
 
 
 

+

 // event declarations/classes
 
 class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxNotifyEvent
 // event declarations/classes
 
 class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxNotifyEvent


@@ -140,24 +298,33 @@ public:
                        int win_id = 0)
           : wxNotifyEvent(command_type, win_id)
     {
                        int win_id = 0)
           : wxNotifyEvent(command_type, win_id)
     {

+        old_selection = -1;
+        selection = -1;
+        drag_source = NULL;

     }
 #ifndef SWIG
     wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxNotifyEvent(c)
     {
         old_selection = c.old_selection;
         selection = c.selection;
     }
 #ifndef SWIG
     wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxNotifyEvent(c)
     {
         old_selection = c.old_selection;
         selection = c.selection;

+        drag_source = c.drag_source;

     }
 #endif
     wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); }
 
     void SetSelection(int s) { selection = s; m_commandInt = s; }
     }
 #endif
     wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); }
 
     void SetSelection(int s) { selection = s; m_commandInt = s; }

-    void SetOldSelection(int s) { old_selection = s; }

     int GetSelection() const { return selection; }
     int GetSelection() const { return selection; }

+    
+    void SetOldSelection(int s) { old_selection = s; }

     int GetOldSelection() const { return old_selection; }
     int GetOldSelection() const { return old_selection; }

+    
+    void SetDragSource(wxAuiNotebook* s) { drag_source = s; }
+    wxAuiNotebook* GetDragSource() const { return drag_source; }

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

+    wxAuiNotebook* drag_source;

 
 #ifndef SWIG
 private:
 
 #ifndef SWIG
 private:


@@ -182,9 +349,10 @@ public:
 class WXDLLIMPEXP_AUI wxAuiTabContainerButton
 {
 public:
 class WXDLLIMPEXP_AUI wxAuiTabContainerButton
 {
 public:

+

     int id;               // button's id
     int cur_state;        // current state (normal, hover, pressed, etc.)
     int id;               // button's id
     int cur_state;        // current state (normal, hover, pressed, etc.)

-    int location;         // buttons location (wxLEFT or wxRIGHT)
+    int location;         // buttons location (wxLEFT, wxRIGHT, or wxCENTER)

     wxBitmap bitmap;      // button's hover bitmap
     wxBitmap dis_bitmap;  // button's disabled bitmap
     wxRect rect;          // button's hit rectangle
     wxBitmap bitmap;      // button's hover bitmap
     wxBitmap dis_bitmap;  // button's disabled bitmap
     wxRect rect;          // button's hit rectangle


@@ -204,8 +372,11 @@ public:
     wxAuiTabContainer();
     virtual ~wxAuiTabContainer();
 
     wxAuiTabContainer();
     virtual ~wxAuiTabContainer();
 

-    void SetArtProvider(wxTabArt* art);
-    wxTabArt* GetArtProvider();
+    void SetArtProvider(wxAuiTabArt* art);
+    wxAuiTabArt* GetArtProvider();
+
+    void SetFlags(unsigned int flags);
+    unsigned int GetFlags() const;

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


@@ -227,6 +398,8 @@ 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 RemoveButton(int id);

     void AddButton(int id,
                    int location,
                    const wxBitmap& normal_bitmap = wxNullBitmap,
     void AddButton(int id,
                    int location,
                    const wxBitmap& normal_bitmap = wxNullBitmap,


@@ -237,15 +410,17 @@ public:
     
 protected:
 
     
 protected:
 

-    virtual void Render(wxDC* dc);
+    virtual void Render(wxDC* dc, wxWindow* wnd);

 
 

-private:
+protected:

 
 

-    wxTabArt* m_art;
+    wxAuiTabArt* m_art;

     wxAuiNotebookPageArray m_pages;
     wxAuiTabContainerButtonArray m_buttons;
     wxAuiNotebookPageArray m_pages;
     wxAuiTabContainerButtonArray m_buttons;

+    wxAuiTabContainerButtonArray m_tab_close_buttons;

     wxRect m_rect;
     size_t m_tab_offset;
     wxRect m_rect;
     size_t m_tab_offset;

+    unsigned int m_flags;

 };
 
 
 };
 
 


@@ -283,6 +458,7 @@ protected:
     wxAuiTabContainerButton* m_hover_button;
 
 #ifndef SWIG
     wxAuiTabContainerButton* m_hover_button;
 
 #ifndef SWIG

+    DECLARE_CLASS(wxAuiTabCtrl)

     DECLARE_EVENT_TABLE()
 #endif
 };
     DECLARE_EVENT_TABLE()
 #endif
 };


@@ -290,20 +466,20 @@ protected:
 
 
 
 
 
 

-class WXDLLIMPEXP_AUI wxAuiMultiNotebook : public wxControl
+class WXDLLIMPEXP_AUI wxAuiNotebook : public wxControl

 {
 
 public:
 
 {
 
 public:
 

-    wxAuiMultiNotebook();
+    wxAuiNotebook();

 
 

-    wxAuiMultiNotebook(wxWindow* parent,
-                       wxWindowID id = wxID_ANY,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = 0);
+    wxAuiNotebook(wxWindow* parent,
+                  wxWindowID id = wxID_ANY,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,
+                  long style = wxAUI_NB_DEFAULT_STYLE);

 
 

-    virtual ~wxAuiMultiNotebook();
+    virtual ~wxAuiNotebook();

 
     bool Create(wxWindow* parent,
                 wxWindowID id = wxID_ANY,
 
     bool Create(wxWindow* parent,
                 wxWindowID id = wxID_ANY,


@@ -324,6 +500,8 @@ public:
 
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);
 
     bool DeletePage(size_t page);
     bool RemovePage(size_t page);

+    
+    void SetWindowStyleFlag(long style);

 
     bool SetPageText(size_t page, const wxString& text);
     size_t SetSelection(size_t new_page);
 
     bool SetPageText(size_t page, const wxString& text);
     size_t SetSelection(size_t new_page);


@@ -331,8 +509,9 @@ public:
     size_t GetPageCount() const;
     wxWindow* GetPage(size_t page_idx) const;
 
     size_t GetPageCount() const;
     wxWindow* GetPage(size_t page_idx) const;
 

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

 
 protected:
 
 
 protected:
 


@@ -345,10 +524,10 @@ protected:
 protected:
 
     void DoSizing();
 protected:
 
     void DoSizing();

-    void InitNotebook();
+    void InitNotebook(long style);

 
     void OnChildFocus(wxChildFocusEvent& evt);
 
     void OnChildFocus(wxChildFocusEvent& evt);

-    void OnRender(wxFrameManagerEvent& evt);
+    void OnRender(wxAuiManagerEvent& evt);

     void OnEraseBackground(wxEraseEvent& evt);
     void OnSize(wxSizeEvent& evt);
     void OnTabClicked(wxCommandEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
     void OnSize(wxSizeEvent& evt);
     void OnTabClicked(wxCommandEvent& evt);


@@ -359,7 +538,7 @@ protected:
     
 protected:
 
     
 protected:
 

-    wxFrameManager m_mgr;
+    wxAuiManager m_mgr;

     wxAuiTabContainer m_tabs;
     int m_curpage;
     int m_tab_id_counter;
     wxAuiTabContainer m_tabs;
     int m_curpage;
     int m_tab_id_counter;


@@ -370,8 +549,10 @@ protected:
     int m_tab_ctrl_height;
     
     int m_last_drag_x;
     int m_tab_ctrl_height;
     
     int m_last_drag_x;

+    unsigned int m_flags;

 
 #ifndef SWIG
 
 #ifndef SWIG

+    DECLARE_CLASS(wxAuiNotebook)

     DECLARE_EVENT_TABLE()
 #endif
 };
     DECLARE_EVENT_TABLE()
 #endif
 };


@@ -384,19 +565,23 @@ protected:
 #ifndef SWIG
 
 BEGIN_DECLARE_EVENT_TYPES()
 #ifndef SWIG
 
 BEGIN_DECLARE_EVENT_TYPES()

+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 0)

     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 0)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 0)

+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 0)

 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
 
 #define wxAuiNotebookEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiNotebookEventFunction, &func)
 END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&);
 
 #define wxAuiNotebookEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiNotebookEventFunction, &func)

-
+    
+#define EVT_AUINOTEBOOK_PAGE_CLOSE(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, winid, wxAuiNotebookEventHandler(fn))

 #define EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \
 #define EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn))
 #define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \


@@ -409,24 +594,30 @@ 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))

+#define EVT_AUINOTEBOOK_ALLOW_DND(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, winid, wxAuiNotebookEventHandler(fn))

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

+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE;

 %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;
 %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;

+%constant wxEventType wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND;

 
 %pythoncode {
 
 %pythoncode {

+    EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 1 )

     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 )
     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 )

+    EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 1 )

 }
 #endif
 
 }
 #endif