X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/generic/tabg.h?ds=sidebyside

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index c24ed23ce5..a5975e5f8a 100644
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tabg.h
-// Purpose:     Generic tabbed dialogs
+// Name:        wx/generic/tabg.h
+// Purpose:     Generic tabbed dialogs; used by wxMotif's wxNotebook
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
@@ -20,18 +20,18 @@
 #include "wx/panel.h"
 #include "wx/list.h"
 
-class WXDLLEXPORT wxTabView;
+class WXDLLIMPEXP_FWD_CORE wxTabView;
 
 /*
  * A wxTabControl is the internal and visual representation
  * of the tab.
  */
 
-class WXDLLEXPORT wxTabControl: public wxObject
+class WXDLLIMPEXP_CORE wxTabControl: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxTabControl)
 public:
-    wxTabControl(wxTabView *v = (wxTabView *) NULL);
+    wxTabControl(wxTabView *v = NULL);
     virtual ~wxTabControl(void);
 
     virtual void OnDraw(wxDC& dc, bool lastInRow);
@@ -81,7 +81,7 @@ protected:
  * are 3 layers in the MS Word Options dialog.
  */
 
-class WXDLLEXPORT wxTabLayer: public wxList
+class WXDLLIMPEXP_CORE wxTabLayer: public wxList
 {
 };
 
@@ -94,7 +94,7 @@ WX_DECLARE_LIST(wxTabLayer, wxTabLayerList);
 #define wxTAB_STYLE_DRAW_BOX         1   // Draws 3D boxes round tab layers
 #define wxTAB_STYLE_COLOUR_INTERIOR  2   // Colours interior of tabs, otherwise draws outline
 
-class WXDLLEXPORT wxTabView: public wxObject
+class WXDLLIMPEXP_CORE wxTabView: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxTabView)
 public:
@@ -102,17 +102,13 @@ public:
   virtual ~wxTabView();
 
   inline int GetNumberOfLayers() const { return m_layers.GetCount(); }
-#if WXWIN_COMPATIBILITY_2_4
-  inline wxList& GetLayers() { return *(wxList *)&m_layers; }
-#else
   inline wxTabLayerList& GetLayers() { return m_layers; }
-#endif
 
   inline void SetWindow(wxWindow* wnd) { m_window = wnd; }
   inline wxWindow* GetWindow(void) const { return m_window; }
 
   // Automatically positions tabs
-  wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = (wxTabControl *) NULL);
+  wxTabControl *AddTab(int id, const wxString& label, wxTabControl *existingTab = NULL);
 
   // Remove the tab without deleting the window
   bool RemoveTab(int id);
@@ -134,7 +130,7 @@ public:
   // Called when a tab is activated
   virtual void OnTabActivate(int activateId, int deactivateId);
   // Allows vetoing
-  virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; };
+  virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; }
 
   // Allows use of application-supplied wxTabControl classes.
   virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); }
@@ -270,7 +266,7 @@ protected:
  * A dialog box class that is tab-friendly
  */
 
-class WXDLLEXPORT wxTabbedDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxTabbedDialog : public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxTabbedDialog)
 
@@ -302,7 +298,7 @@ private:
  * A panel class that is tab-friendly
  */
 
-class WXDLLEXPORT wxTabbedPanel : public wxPanel
+class WXDLLIMPEXP_CORE wxTabbedPanel : public wxPanel
 {
     DECLARE_DYNAMIC_CLASS(wxTabbedPanel)
 
@@ -331,7 +327,7 @@ private:
 WX_DECLARE_HASH_MAP(int, wxWindow*, wxIntegerHash, wxIntegerEqual,
                     wxIntToWindowHashMap);
 
-class WXDLLEXPORT wxPanelTabView : public wxTabView
+class WXDLLIMPEXP_CORE wxPanelTabView : public wxTabView
 {
     DECLARE_DYNAMIC_CLASS(wxPanelTabView)