Adding label editing to native OS X listctrl.

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

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 70758e04ebf7df83647c218c5b91d5b6f1a81541..5f7d548bd1c425b0db948efd9543a02f06d7fb30 100644 (file)
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/generic/mdig.h
+// Name:        wx/generic/tabmdi.h

 // Purpose:     Generic MDI (Multiple Document Interface) classes
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation
 // Purpose:     Generic MDI (Multiple Document Interface) classes
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation


@@ -12,6 +12,8 @@
 #ifndef _WX_AUITABMDI_H_
 #define _WX_AUITABMDI_H_
 
 #ifndef _WX_AUITABMDI_H_
 #define _WX_AUITABMDI_H_
 

+#if wxUSE_AUI
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -19,28 +21,25 @@
 #include "wx/frame.h"
 #include "wx/panel.h"
 #include "wx/notebook.h"
 #include "wx/frame.h"
 #include "wx/panel.h"
 #include "wx/notebook.h"

-#include "wx/aui/notebook.h"
-
-extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
+#include "wx/aui/auibook.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTabMDIParentFrame;
-class WXDLLEXPORT wxTabMDIClientWindow;
-class WXDLLEXPORT wxTabMDIChildFrame;
+class WXDLLIMPEXP_AUI wxAuiMDIParentFrame;
+class WXDLLIMPEXP_AUI wxAuiMDIClientWindow;
+class WXDLLIMPEXP_AUI wxAuiMDIChildFrame;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxTabMDIParentFrame
+// wxAuiMDIParentFrame

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTabMDIParentFrame : public wxFrame
+class WXDLLIMPEXP_AUI wxAuiMDIParentFrame : public wxFrame

 {
 public:
 {
 public:

-    wxTabMDIParentFrame();
-    wxTabMDIParentFrame(wxWindow *parent,
+    wxAuiMDIParentFrame();
+    wxAuiMDIParentFrame(wxWindow *parent,

                         wxWindowID winid,
                         const wxString& title,
                         const wxPoint& pos = wxDefaultPosition,
                         wxWindowID winid,
                         const wxString& title,
                         const wxPoint& pos = wxDefaultPosition,


@@ -48,8 +47,8 @@ public:
                         long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                         const wxString& name = wxFrameNameStr);
 
                         long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                         const wxString& name = wxFrameNameStr);
 

-    ~wxTabMDIParentFrame();
-    
+    ~wxAuiMDIParentFrame();
+

     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& title,
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& title,


@@ -65,15 +64,15 @@ public:
     virtual void SetMenuBar(wxMenuBar *pMenuBar);
 #endif // wxUSE_MENUS
 
     virtual void SetMenuBar(wxMenuBar *pMenuBar);
 #endif // wxUSE_MENUS
 

-    void SetChildMenuBar(wxTabMDIChildFrame *pChild);
+    void SetChildMenuBar(wxAuiMDIChildFrame *pChild);

 
     virtual bool ProcessEvent(wxEvent& event);
 
 
     virtual bool ProcessEvent(wxEvent& event);
 

-    wxTabMDIChildFrame *GetActiveChild() const;
-    inline void SetActiveChild(wxTabMDIChildFrame* pChildFrame);
+    wxAuiMDIChildFrame *GetActiveChild() const;
+    inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);

 
 

-    wxTabMDIClientWindow *GetClientWindow() const;
-    virtual wxTabMDIClientWindow *OnCreateClient();
+    wxAuiMDIClientWindow *GetClientWindow() const;
+    virtual wxAuiMDIClientWindow *OnCreateClient();

 
     virtual void Cascade() { /* Has no effect */ }
     virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }
 
     virtual void Cascade() { /* Has no effect */ }
     virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }


@@ -82,9 +81,9 @@ public:
     virtual void ActivatePrevious();
 
 protected:
     virtual void ActivatePrevious();
 
 protected:

-    wxTabMDIClientWindow   *m_pClientWindow;
-    wxTabMDIChildFrame     *m_pActiveChild;
-    
+    wxAuiMDIClientWindow   *m_pClientWindow;
+    wxAuiMDIChildFrame     *m_pActiveChild;
+

 #if wxUSE_MENUS
     wxMenu              *m_pWindowMenu;
     wxMenuBar           *m_pMyMenuBar;
 #if wxUSE_MENUS
     wxMenu              *m_pWindowMenu;
     wxMenuBar           *m_pMyMenuBar;


@@ -104,18 +103,18 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxTabMDIParentFrame)
+    DECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxTabMDIChildFrame
+// wxAuiMDIChildFrame

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTabMDIChildFrame : public wxPanel
+class WXDLLIMPEXP_AUI wxAuiMDIChildFrame : public wxPanel

 {
 public:
 {
 public:

-    wxTabMDIChildFrame();
-    wxTabMDIChildFrame(wxTabMDIParentFrame *parent,
+    wxAuiMDIChildFrame();
+    wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent,

                        wxWindowID winid,
                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,
                        wxWindowID winid,
                        const wxString& title,
                        const wxPoint& pos = wxDefaultPosition,


@@ -123,8 +122,8 @@ public:
                        long style = wxDEFAULT_FRAME_STYLE,
                        const wxString& name = wxFrameNameStr);
 
                        long style = wxDEFAULT_FRAME_STYLE,
                        const wxString& name = wxFrameNameStr);
 

-    virtual ~wxTabMDIChildFrame();
-    bool Create(wxTabMDIParentFrame *parent,
+    virtual ~wxAuiMDIChildFrame();
+    bool Create(wxAuiMDIParentFrame *parent,

                 wxWindowID winid,
                 const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,
                 wxWindowID winid,
                 const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,


@@ -142,7 +141,7 @@ public:
 
     virtual void Activate();
     virtual bool Destroy();
 
     virtual void Activate();
     virtual bool Destroy();

-    
+

 #if wxUSE_STATUSBAR
     // no status bars
     virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
 #if wxUSE_STATUSBAR
     // no status bars
     virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,


@@ -190,12 +189,12 @@ public:
     void OnMenuHighlight(wxMenuEvent& evt);
     void OnActivate(wxActivateEvent& evt);
     void OnCloseWindow(wxCloseEvent& evt);
     void OnMenuHighlight(wxMenuEvent& evt);
     void OnActivate(wxActivateEvent& evt);
     void OnCloseWindow(wxCloseEvent& evt);

-    
-    void SetMDIParentFrame(wxTabMDIParentFrame* parent);
-    wxTabMDIParentFrame* GetMDIParentFrame() const;
+
+    void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
+    wxAuiMDIParentFrame* GetMDIParentFrame() const;

 
 protected:
 
 protected:

-    wxTabMDIParentFrame *m_pMDIParentFrame;
+    wxAuiMDIParentFrame *m_pMDIParentFrame;

     wxRect            m_mdi_newrect;
     wxRect            m_mdi_currect;
     wxString          m_title;
     wxRect            m_mdi_newrect;
     wxRect            m_mdi_currect;
     wxString          m_title;


@@ -219,37 +218,38 @@ public:
     void DoShow(bool show);
 
 private:
     void DoShow(bool show);
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxTabMDIChildFrame)
+    DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame)

     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()
 

-    friend class wxTabMDIClientWindow;
+    friend class wxAuiMDIClientWindow;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxTabMDIClientWindow
+// wxAuiMDIClientWindow

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTabMDIClientWindow : public wxAuiMultiNotebook
+class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook

 {
 public:
 {
 public:

-    wxTabMDIClientWindow();
-    wxTabMDIClientWindow(wxTabMDIParentFrame *parent, long style = 0);
-    ~wxTabMDIClientWindow();
-    
-    virtual bool CreateClient(wxTabMDIParentFrame *parent,
+    wxAuiMDIClientWindow();
+    wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0);
+    ~wxAuiMDIClientWindow();
+
+    virtual bool CreateClient(wxAuiMDIParentFrame *parent,

                               long style = wxVSCROLL | wxHSCROLL);
 
     virtual int SetSelection(size_t page);
 
 protected:
 
                               long style = wxVSCROLL | wxHSCROLL);
 
     virtual int SetSelection(size_t page);
 
 protected:
 

-    void PageChanged(int old_selection, int new_selection);    
+    void PageChanged(int old_selection, int new_selection);

     void OnPageChanged(wxAuiNotebookEvent& event);
     void OnSize(wxSizeEvent& evt);
 
 private:
     void OnPageChanged(wxAuiNotebookEvent& event);
     void OnSize(wxSizeEvent& evt);
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxTabMDIClientWindow)
+    DECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow)

     DECLARE_EVENT_TABLE()
 };
     DECLARE_EVENT_TABLE()
 };

+#endif // wxUSE_AUI

 
 #endif // _WX_AUITABMDI_H_
 
 #endif // _WX_AUITABMDI_H_