projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix history in wxWebViewIE when using a custom file scheme.
[wxWidgets.git]
/
src
/
generic
/
tabg.cpp
diff --git
a/src/generic/tabg.cpp
b/src/generic/tabg.cpp
index cec7c1d37a0ca280d81fa65622b5d131a06406ec..2ce29fd0492a5056a240ed34e5f4334f94bc1c2d 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)
@@
-85,7
+83,8
@@
void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
// Draw grey background
if (m_view->GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
{
// Draw grey background
if (m_view->GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
{
- dc.SetBrush(*m_view->GetBackgroundBrush());
+ if(m_view->GetBackgroundBrush())
+ dc.SetBrush(*m_view->GetBackgroundBrush());
// Add 1 because the pen is transparent. Under Motif, may be different.
#ifdef __WXMOTIF__
// Add 1 because the pen is transparent. Under Motif, may be different.
#ifdef __WXMOTIF__
@@
-206,7
+205,7
@@
void wxTabControl::OnDraw(wxDC& dc, bool lastInRow)
wxColour col(m_view->GetTextColour());
dc.SetTextForeground(col);
dc.SetBackgroundMode(wxTRANSPARENT);
wxColour col(m_view->GetTextColour());
dc.SetTextForeground(col);
dc.SetBackgroundMode(wxTRANSPARENT);
-
long
textWidth, textHeight;
+
wxCoord
textWidth, textHeight;
dc.GetTextExtent(GetLabel(), &textWidth, &textHeight);
int textX = (int)(tabX + (GetWidth() - textWidth)/2.0);
dc.GetTextExtent(GetLabel(), &textWidth, &textHeight);
int textX = (int)(tabX + (GetWidth() - textWidth)/2.0);
@@
-523,14
+522,14
@@
wxTabView::wxTabView(long style)
m_tabViewRect.x = 300;
m_highlightColour = *wxWHITE;
m_shadowColour = wxColour(128, 128, 128);
m_tabViewRect.x = 300;
m_highlightColour = *wxWHITE;
m_shadowColour = wxColour(128, 128, 128);
- m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+
//
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
m_textColour = *wxBLACK;
m_highlightPen = wxWHITE_PEN;
m_shadowPen = wxGREY_PEN;
m_textColour = *wxBLACK;
m_highlightPen = wxWHITE_PEN;
m_shadowPen = wxGREY_PEN;
- SetBackgroundColour(m_backgroundColour);
+
//
SetBackgroundColour(m_backgroundColour);
m_tabFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
m_tabSelectedFont = wxSystemSettings::GetFont(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 = NULL;
}
wxTabView::~wxTabView()
}
wxTabView::~wxTabView()
@@
-580,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();
@@
-730,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);
@@
-752,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;
}
}
}
}
@@
-797,7
+796,8
@@
void wxTabView::Draw(wxDC& dc)
if (GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
{
dc.SetPen(*wxTRANSPARENT_PEN);
if (GetTabStyle() & wxTAB_STYLE_COLOUR_INTERIOR)
{
dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(*GetBackgroundBrush());
+ if(GetBackgroundBrush())
+ dc.SetBrush(*GetBackgroundBrush());
// Add 1 because the pen is transparent. Under Motif, may be different.
dc.DrawRectangle(
// Add 1 because the pen is transparent. Under Motif, may be different.
dc.DrawRectangle(
@@
-881,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)
@@
-1009,20
+1009,20
@@
void wxTabView::OnTabActivate(int /*activateId*/, int /*deactivateId*/)
void wxTabView::SetHighlightColour(const wxColour& col)
{
m_highlightColour = col;
void wxTabView::SetHighlightColour(const wxColour& col)
{
m_highlightColour = col;
- m_highlightPen = wxThePenList->FindOrCreatePen(col
, 1, wxSOLID
);
+ m_highlightPen = wxThePenList->FindOrCreatePen(col);
}
void wxTabView::SetShadowColour(const wxColour& col)
{
m_shadowColour = col;
}
void wxTabView::SetShadowColour(const wxColour& col)
{
m_shadowColour = col;
- m_shadowPen = wxThePenList->FindOrCreatePen(col
, 1, wxSOLID
);
+ m_shadowPen = wxThePenList->FindOrCreatePen(col);
}
void wxTabView::SetBackgroundColour(const wxColour& col)
{
m_backgroundColour = col;
}
void wxTabView::SetBackgroundColour(const wxColour& col)
{
m_backgroundColour = col;
- m_backgroundPen = wxThePenList->FindOrCreatePen(col
, 1, wxSOLID
);
- m_backgroundBrush = wxTheBrushList->FindOrCreateBrush(col
, wxSOLID
);
+ m_backgroundPen = wxThePenList->FindOrCreatePen(col);
+ m_backgroundBrush = wxTheBrushList->FindOrCreateBrush(col);
}
// this may be called with sel = zero (which doesn't match any page)
}
// this may be called with sel = zero (which doesn't match any page)
@@
-1081,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)
@@
-1089,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();
}
@@
-1150,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)
@@
-1192,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)
@@
-1223,7
+1223,7
@@
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)))
((wxTabbedDialog *)m_panel)->SetTabView(this);
if (m_panel->IsKindOf(CLASSINFO(wxTabbedDialog)))
((wxTabbedDialog *)m_panel)->SetTabView(this);
@@
-1287,4
+1287,3
@@
void wxPanelTabView::ShowWindowForTab(int id)
newWindow->Refresh();
}
newWindow->Refresh();
}
-#endif // wxUSE_TAB_DIALOG