Removed rundant files, updated readme.txt.

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

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index c46ff59cd3cb374d8fecd925d2bd9d9f9c891a19..33119247e69175e836a5a073c0c05bcaf54d59ba 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_TAB_DIALOG
+

 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif


@@ -526,8 +528,8 @@ wxTabView::wxTabView(long style)
   m_shadowPen = wxGREY_PEN;
   m_backgroundPen = wxLIGHT_GREY_PEN;
   m_backgroundBrush = wxLIGHT_GREY_BRUSH;
   m_shadowPen = wxGREY_PEN;
   m_backgroundPen = wxLIGHT_GREY_PEN;
   m_backgroundBrush = wxLIGHT_GREY_BRUSH;

-  m_tabFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-  m_tabSelectedFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+  m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+  m_tabSelectedFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

   m_window = (wxWindow *) NULL;
 }
 
   m_window = (wxWindow *) NULL;
 }
 


@@ -699,6 +701,7 @@ void wxTabView::ClearTabs(bool deleteTabs)
     layerNode = nextLayerNode;
   }
   m_noTabs = 0;
     layerNode = nextLayerNode;
   }
   m_noTabs = 0;

+  m_tabSelection = -1;

 }
 
 
 }
 
 


@@ -875,8 +878,8 @@ bool wxTabView::OnEvent(wxMouseEvent& event)
   if (!event.LeftDown())
     return FALSE;
 
   if (!event.LeftDown())
     return FALSE;
 

-  long x, y;
-  event.Position(&x, &y);
+  wxCoord x, y;
+  event.GetPosition(&x, &y);

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


@@ -1024,6 +1027,9 @@ void wxTabView::SetBackgroundColour(const wxColour& col)
 
 void wxTabView::SetTabSelection(int sel, bool activateTool)
 {
 
 void wxTabView::SetTabSelection(int sel, bool activateTool)
 {

+  if ( sel==m_tabSelection )
+    return;
+

   int oldSel = m_tabSelection;
   wxTabControl *control = FindTabControlForId(sel);
   wxTabControl *oldControl = FindTabControlForId(m_tabSelection);
   int oldSel = m_tabSelection;
   wxTabControl *control = FindTabControlForId(sel);
   wxTabControl *oldControl = FindTabControlForId(m_tabSelection);


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

+#endif // wxUSE_TAB_DIALOG