Change GetC to return an int so that it can return wxEOF on error.

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

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 70758e04ebf7df83647c218c5b91d5b6f1a81541..4cf3d76ef97fe1a55245e29bd676358093dc3dd9 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
@@ -12,6 +12,8 @@
 #ifndef _WX_AUITABMDI_H_
 #define _WX_AUITABMDI_H_
 
+#if wxUSE_AUI
+
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -19,24 +21,21 @@
 #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
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTabMDIParentFrame;
-class WXDLLEXPORT wxTabMDIClientWindow;
-class WXDLLEXPORT wxTabMDIChildFrame;
+class WXDLLIMPEXP_AUI wxTabMDIParentFrame;
+class WXDLLIMPEXP_AUI wxTabMDIClientWindow;
+class WXDLLIMPEXP_AUI wxTabMDIChildFrame;
 
 //-----------------------------------------------------------------------------
 // wxTabMDIParentFrame
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTabMDIParentFrame : public wxFrame
+class WXDLLIMPEXP_AUI wxTabMDIParentFrame : public wxFrame
 {
 public:
     wxTabMDIParentFrame();
@@ -49,7 +48,7 @@ public:
                         const wxString& name = wxFrameNameStr);
 
     ~wxTabMDIParentFrame();
-    
+
     bool Create(wxWindow *parent,
                 wxWindowID winid,
                 const wxString& title,
@@ -84,7 +83,7 @@ public:
 protected:
     wxTabMDIClientWindow   *m_pClientWindow;
     wxTabMDIChildFrame     *m_pActiveChild;
-    
+
 #if wxUSE_MENUS
     wxMenu              *m_pWindowMenu;
     wxMenuBar           *m_pMyMenuBar;
@@ -111,7 +110,7 @@ private:
 // wxTabMDIChildFrame
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTabMDIChildFrame : public wxPanel
+class WXDLLIMPEXP_AUI wxTabMDIChildFrame : public wxPanel
 {
 public:
     wxTabMDIChildFrame();
@@ -142,7 +141,7 @@ public:
 
     virtual void Activate();
     virtual bool Destroy();
-    
+
 #if wxUSE_STATUSBAR
     // no status bars
     virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
@@ -190,7 +189,7 @@ public:
     void OnMenuHighlight(wxMenuEvent& evt);
     void OnActivate(wxActivateEvent& evt);
     void OnCloseWindow(wxCloseEvent& evt);
-    
+
     void SetMDIParentFrame(wxTabMDIParentFrame* parent);
     wxTabMDIParentFrame* GetMDIParentFrame() const;
 
@@ -229,13 +228,13 @@ private:
 // wxTabMDIClientWindow
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTabMDIClientWindow : public wxAuiMultiNotebook
+class WXDLLIMPEXP_AUI wxTabMDIClientWindow : public wxAuiMultiNotebook
 {
 public:
     wxTabMDIClientWindow();
     wxTabMDIClientWindow(wxTabMDIParentFrame *parent, long style = 0);
     ~wxTabMDIClientWindow();
-    
+
     virtual bool CreateClient(wxTabMDIParentFrame *parent,
                               long style = wxVSCROLL | wxHSCROLL);
 
@@ -243,7 +242,7 @@ public:
 
 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);
 
@@ -251,5 +250,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxTabMDIClientWindow)
     DECLARE_EVENT_TABLE()
 };
+#endif // wxUSE_AUI
 
 #endif // _WX_AUITABMDI_H_