updated setup.h for OpenVMS

[wxWidgets.git] / src / generic / tabg.cpp

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 365b1c78f65021a13feb15ecb1619140463069ba..9f7f8e092b1ffdbe4619ec90f5a0cb9f2a3359ca 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/generic/tabg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/generic/tabg.cpp

-// Purpose:     Generic tabbed dialogs
+// Purpose:     Generic tabbed dialogs; used by wxMotif's wxNotebook

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -16,8 +16,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_TAB_DIALOG
-

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/intl.h"


@@ -29,7 +27,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
 #include <stdlib.h>
 #include <stdarg.h>
 

-#include "wx/tab.h"
+#include "wx/generic/tabg.h"

 #include "wx/listimpl.cpp"
 
 WX_DEFINE_LIST(wxTabLayerList)
 #include "wx/listimpl.cpp"
 
 WX_DEFINE_LIST(wxTabLayerList)


@@ -531,7 +529,7 @@ wxTabView::wxTabView(long style)
   // SetBackgroundColour(m_backgroundColour);
   m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
   m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
   // SetBackgroundColour(m_backgroundColour);
   m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
   m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

-  m_window = (wxWindow *) NULL;
+  m_window = NULL;

 }
 
 wxTabView::~wxTabView()
 }
 
 wxTabView::~wxTabView()


@@ -581,7 +579,7 @@ wxTabControl *wxTabView::AddTab(int id, const wxString& label, wxTabControl *exi
   tabControl->SetRowPosition(tabLayer->GetCount());
   tabControl->SetColPosition(layer);
 
   tabControl->SetRowPosition(tabLayer->GetCount());
   tabControl->SetColPosition(layer);
 

-  wxTabControl *lastTab = (wxTabControl *) NULL;
+  wxTabControl *lastTab = NULL;

   if (lastTabNode)
     lastTab = (wxTabControl *)lastTabNode->GetData();
 
   if (lastTabNode)
     lastTab = (wxTabControl *)lastTabNode->GetData();
 


@@ -731,7 +729,7 @@ void wxTabView::LayoutTabs(void)
     layerNode = nextLayerNode;
   }
 
     layerNode = nextLayerNode;
   }
 

-  wxTabControl *lastTab = (wxTabControl *) NULL;
+  wxTabControl *lastTab = NULL;

 
   wxTabLayer *currentLayer = new wxTabLayer;
   m_layers.Append(currentLayer);
 
   wxTabLayer *currentLayer = new wxTabLayer;
   m_layers.Append(currentLayer);


@@ -753,7 +751,7 @@ void wxTabView::LayoutTabs(void)
      {
        currentLayer = new wxTabLayer;
        m_layers.Append(currentLayer);
      {
        currentLayer = new wxTabLayer;
        m_layers.Append(currentLayer);

-       lastTab = (wxTabControl *) NULL;
+       lastTab = NULL;

      }
     }
 
      }
     }
 


@@ -883,7 +881,7 @@ bool wxTabView::OnEvent(wxMouseEvent& event)
   wxCoord x, y;
   event.GetPosition(&x, &y);
 
   wxCoord x, y;
   event.GetPosition(&x, &y);
 

-  wxTabControl *hitControl = (wxTabControl *) NULL;
+  wxTabControl *hitControl = NULL;

 
   wxTabLayerList::compatibility_iterator node = m_layers.GetFirst();
   while (node)
 
   wxTabLayerList::compatibility_iterator node = m_layers.GetFirst();
   while (node)


@@ -1083,7 +1081,7 @@ wxTabControl *wxTabView::FindTabControlForId(int id) const
     }
     node1 = node1->GetNext();
   }
     }
     node1 = node1->GetNext();
   }

-  return (wxTabControl *) NULL;
+  return NULL;

 }
 
 // Find tab control for layer, position (starting from zero)
 }
 
 // Find tab control for layer, position (starting from zero)


@@ -1091,11 +1089,11 @@ wxTabControl *wxTabView::FindTabControlForPosition(int layer, int position) cons
 {
   wxTabLayerList::compatibility_iterator node1 = m_layers.Item(layer);
   if (!node1)
 {
   wxTabLayerList::compatibility_iterator node1 = m_layers.Item(layer);
   if (!node1)

-    return (wxTabControl *) NULL;
+    return NULL;

   wxTabLayer *tabLayer = (wxTabLayer *)node1->GetData();
   wxList::compatibility_iterator node2 = tabLayer->Item(position);
   if (!node2)
   wxTabLayer *tabLayer = (wxTabLayer *)node1->GetData();
   wxList::compatibility_iterator node2 = tabLayer->Item(position);
   if (!node2)

-    return (wxTabControl *) NULL;
+    return NULL;

   return (wxTabControl *)node2->GetData();
 }
 
   return (wxTabControl *)node2->GetData();
 }
 


@@ -1152,7 +1150,7 @@ wxTabbedDialog::wxTabbedDialog(wxWindow *parent, wxWindowID id,
     long windowStyle, const wxString& name):
    wxDialog(parent, id, title, pos, size, windowStyle, name)
 {
     long windowStyle, const wxString& name):
    wxDialog(parent, id, title, pos, size, windowStyle, name)
 {

-  m_tabView = (wxTabView *) NULL;
+  m_tabView = NULL;

 }
 
 wxTabbedDialog::~wxTabbedDialog(void)
 }
 
 wxTabbedDialog::~wxTabbedDialog(void)


@@ -1194,7 +1192,7 @@ wxTabbedPanel::wxTabbedPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos
    const wxSize& size, long windowStyle, const wxString& name):
    wxPanel(parent, id, pos, size, windowStyle, name)
 {
    const wxSize& size, long windowStyle, const wxString& name):
    wxPanel(parent, id, pos, size, windowStyle, name)
 {

-  m_tabView = (wxTabView *) NULL;
+  m_tabView = NULL;

 }
 
 wxTabbedPanel::~wxTabbedPanel(void)
 }
 
 wxTabbedPanel::~wxTabbedPanel(void)


@@ -1225,11 +1223,11 @@ wxPanelTabView::wxPanelTabView(wxPanel *pan, long style)
     : wxTabView(style)
 {
   m_panel = pan;
     : wxTabView(style)
 {
   m_panel = pan;

-  m_currentWindow = (wxWindow *) NULL;
+  m_currentWindow = NULL;

 
 

-  if (m_panel->IsKindOf(CLASSINFO(wxTabbedDialog)))
+  if (m_panel->IsKindOf(wxCLASSINFO(wxTabbedDialog)))

     ((wxTabbedDialog *)m_panel)->SetTabView(this);
     ((wxTabbedDialog *)m_panel)->SetTabView(this);

-  else if (m_panel->IsKindOf(CLASSINFO(wxTabbedPanel)))
+  else if (m_panel->IsKindOf(wxCLASSINFO(wxTabbedPanel)))

     ((wxTabbedPanel *)m_panel)->SetTabView(this);
 
   SetWindow(m_panel);
     ((wxTabbedPanel *)m_panel)->SetTabView(this);
 
   SetWindow(m_panel);


@@ -1289,4 +1287,3 @@ void wxPanelTabView::ShowWindowForTab(int id)
   newWindow->Refresh();
 }
 
   newWindow->Refresh();
 }
 

-#endif // wxUSE_TAB_DIALOG