Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed wxAUI_ART to wxAUI_DOCKART

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-11-17 11:28:17 +00:00
parent 4ba1c184b5
commit 254a342953
6 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/wx/aui/framemanager.h
View File

@@ -57,23 +57,23 @@ enum wxAuiManagerOption
enum wxAuiPaneDockArtSetting enum wxAuiPaneDockArtSetting
{ {
wxAUI_ART_SASH_SIZE = 0, wxAUI_DOCKART_SASH_SIZE = 0,
wxAUI_ART_CAPTION_SIZE = 1, wxAUI_DOCKART_CAPTION_SIZE = 1,
wxAUI_ART_GRIPPER_SIZE = 2, wxAUI_DOCKART_GRIPPER_SIZE = 2,
wxAUI_ART_PANE_BORDER_SIZE = 3, wxAUI_DOCKART_PANE_BORDER_SIZE = 3,
wxAUI_ART_PANE_BUTTON_SIZE = 4, wxAUI_DOCKART_PANE_BUTTON_SIZE = 4,
wxAUI_ART_BACKGROUND_COLOUR = 5, wxAUI_DOCKART_BACKGROUND_COLOUR = 5,
wxAUI_ART_SASH_COLOUR = 6, wxAUI_DOCKART_SASH_COLOUR = 6,
wxAUI_ART_ACTIVE_CAPTION_COLOUR = 7, wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR = 7,
wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8, wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8,
wxAUI_ART_INACTIVE_CAPTION_COLOUR = 9, wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR = 9,
wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10, wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10,
wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR = 11, wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR = 11,
wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR = 12, wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR = 12,
wxAUI_ART_BORDER_COLOUR = 13, wxAUI_DOCKART_BORDER_COLOUR = 13,
wxAUI_ART_GRIPPER_COLOUR = 14, wxAUI_DOCKART_GRIPPER_COLOUR = 14,
wxAUI_ART_CAPTION_FONT = 15, wxAUI_DOCKART_CAPTION_FONT = 15,
wxAUI_ART_GRADIENT_TYPE = 16 wxAUI_DOCKART_GRADIENT_TYPE = 16
}; };
enum wxAuiPaneDockArtGradients enum wxAuiPaneDockArtGradients

60
samples/aui/auidemo.cpp
View File

@@ -403,9 +403,9 @@ public:
GetSizer()->SetSizeHints(this); GetSizer()->SetSizeHints(this);
m_frame = frame; m_frame = frame;
m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_PANE_BORDER_SIZE)); m_border_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE));
m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_SASH_SIZE)); m_sash_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_SASH_SIZE));
m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_ART_CAPTION_SIZE)); m_caption_size->SetValue(frame->GetDockArt()->GetMetric(wxAUI_DOCKART_CAPTION_SIZE));
UpdateColors(); UpdateColors();
} }
@@ -429,54 +429,54 @@ private:
void UpdateColors() void UpdateColors()
{ {
wxColour bk = m_frame->GetDockArt()->GetColor(wxAUI_ART_BACKGROUND_COLOUR); wxColour bk = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_BACKGROUND_COLOUR);
m_background_color->SetBitmapLabel(CreateColorBitmap(bk)); m_background_color->SetBitmapLabel(CreateColorBitmap(bk));
wxColour cap = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_COLOUR); wxColour cap = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR);
m_inactive_caption_color->SetBitmapLabel(CreateColorBitmap(cap)); m_inactive_caption_color->SetBitmapLabel(CreateColorBitmap(cap));
wxColour capgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR); wxColour capgrad = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR);
m_inactive_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(capgrad)); m_inactive_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(capgrad));
wxColour captxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR); wxColour captxt = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR);
m_inactive_caption_text_color->SetBitmapLabel(CreateColorBitmap(captxt)); m_inactive_caption_text_color->SetBitmapLabel(CreateColorBitmap(captxt));
wxColour acap = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_COLOUR); wxColour acap = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR);
m_active_caption_color->SetBitmapLabel(CreateColorBitmap(acap)); m_active_caption_color->SetBitmapLabel(CreateColorBitmap(acap));
wxColour acapgrad = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR); wxColour acapgrad = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR);
m_active_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(acapgrad)); m_active_caption_gradient_color->SetBitmapLabel(CreateColorBitmap(acapgrad));
wxColour acaptxt = m_frame->GetDockArt()->GetColor(wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR); wxColour acaptxt = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR);
m_active_caption_text_color->SetBitmapLabel(CreateColorBitmap(acaptxt)); m_active_caption_text_color->SetBitmapLabel(CreateColorBitmap(acaptxt));
wxColour sash = m_frame->GetDockArt()->GetColor(wxAUI_ART_SASH_COLOUR); wxColour sash = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_SASH_COLOUR);
m_sash_color->SetBitmapLabel(CreateColorBitmap(sash)); m_sash_color->SetBitmapLabel(CreateColorBitmap(sash));
wxColour border = m_frame->GetDockArt()->GetColor(wxAUI_ART_BORDER_COLOUR); wxColour border = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_BORDER_COLOUR);
m_border_color->SetBitmapLabel(CreateColorBitmap(border)); m_border_color->SetBitmapLabel(CreateColorBitmap(border));
wxColour gripper = m_frame->GetDockArt()->GetColor(wxAUI_ART_GRIPPER_COLOUR); wxColour gripper = m_frame->GetDockArt()->GetColor(wxAUI_DOCKART_GRIPPER_COLOUR);
m_gripper_color->SetBitmapLabel(CreateColorBitmap(gripper)); m_gripper_color->SetBitmapLabel(CreateColorBitmap(gripper));
} }
void OnPaneBorderSize(wxSpinEvent& event) void OnPaneBorderSize(wxSpinEvent& event)
{ {
m_frame->GetDockArt()->SetMetric(wxAUI_ART_PANE_BORDER_SIZE, m_frame->GetDockArt()->SetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE,
event.GetPosition()); event.GetPosition());
m_frame->DoUpdate(); m_frame->DoUpdate();
} }
void OnSashSize(wxSpinEvent& event) void OnSashSize(wxSpinEvent& event)
{ {
m_frame->GetDockArt()->SetMetric(wxAUI_ART_SASH_SIZE, m_frame->GetDockArt()->SetMetric(wxAUI_DOCKART_SASH_SIZE,
event.GetPosition()); event.GetPosition());
m_frame->DoUpdate(); m_frame->DoUpdate();
} }
void OnCaptionSize(wxSpinEvent& event) void OnCaptionSize(wxSpinEvent& event)
{ {
m_frame->GetDockArt()->SetMetric(wxAUI_ART_CAPTION_SIZE, m_frame->GetDockArt()->SetMetric(wxAUI_DOCKART_CAPTION_SIZE,
event.GetPosition()); event.GetPosition());
m_frame->DoUpdate(); m_frame->DoUpdate();
} }
@@ -491,16 +491,16 @@ private:
int var = 0; int var = 0;
switch (event.GetId()) switch (event.GetId())
{ {
case ID_BackgroundColor: var = wxAUI_ART_BACKGROUND_COLOUR; break; case ID_BackgroundColor: var = wxAUI_DOCKART_BACKGROUND_COLOUR; break;
case ID_SashColor: var = wxAUI_ART_SASH_COLOUR; break; case ID_SashColor: var = wxAUI_DOCKART_SASH_COLOUR; break;
case ID_InactiveCaptionColor: var = wxAUI_ART_INACTIVE_CAPTION_COLOUR; break; case ID_InactiveCaptionColor: var = wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR; break;
case ID_InactiveCaptionGradientColor: var = wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR; break; case ID_InactiveCaptionGradientColor: var = wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR; break;
case ID_InactiveCaptionTextColor: var = wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR; break; case ID_InactiveCaptionTextColor: var = wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR; break;
case ID_ActiveCaptionColor: var = wxAUI_ART_ACTIVE_CAPTION_COLOUR; break; case ID_ActiveCaptionColor: var = wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR; break;
case ID_ActiveCaptionGradientColor: var = wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR; break; case ID_ActiveCaptionGradientColor: var = wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR; break;
case ID_ActiveCaptionTextColor: var = wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR; break; case ID_ActiveCaptionTextColor: var = wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR; break;
case ID_BorderColor: var = wxAUI_ART_BORDER_COLOUR; break; case ID_BorderColor: var = wxAUI_DOCKART_BORDER_COLOUR; break;
case ID_GripperColor: var = wxAUI_ART_GRIPPER_COLOUR; break; case ID_GripperColor: var = wxAUI_DOCKART_GRIPPER_COLOUR; break;
default: return; default: return;
} }
@@ -987,7 +987,7 @@ void MyFrame::OnGradient(wxCommandEvent& event)
case ID_HorizontalGradient: gradient = wxAUI_GRADIENT_HORIZONTAL; break; case ID_HorizontalGradient: gradient = wxAUI_GRADIENT_HORIZONTAL; break;
} }
m_mgr.GetArtProvider()->SetMetric(wxAUI_ART_GRADIENT_TYPE, gradient); m_mgr.GetArtProvider()->SetMetric(wxAUI_DOCKART_GRADIENT_TYPE, gradient);
m_mgr.Update(); m_mgr.Update();
} }
@@ -1125,13 +1125,13 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
switch (event.GetId()) switch (event.GetId())
{ {
case ID_NoGradient: case ID_NoGradient:
event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE); event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_NONE);
break; break;
case ID_VerticalGradient: case ID_VerticalGradient:
event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL); event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_VERTICAL);
break; break;
case ID_HorizontalGradient: case ID_HorizontalGradient:
event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_ART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL); event.Check(m_mgr.GetArtProvider()->GetMetric(wxAUI_DOCKART_GRADIENT_TYPE) == wxAUI_GRADIENT_HORIZONTAL);
break; break;
case ID_AllowFloating: case ID_AllowFloating:
event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0); event.Check((flags & wxAUI_MGR_ALLOW_FLOATING) != 0);

70
src/aui/dockart.cpp
View File

@@ -322,12 +322,12 @@ int wxAuiDefaultDockArt::GetMetric(int id)
{ {
switch (id) switch (id)
{ {
case wxAUI_ART_SASH_SIZE: return m_sash_size; case wxAUI_DOCKART_SASH_SIZE: return m_sash_size;
case wxAUI_ART_CAPTION_SIZE: return m_caption_size; case wxAUI_DOCKART_CAPTION_SIZE: return m_caption_size;
case wxAUI_ART_GRIPPER_SIZE: return m_gripper_size; case wxAUI_DOCKART_GRIPPER_SIZE: return m_gripper_size;
case wxAUI_ART_PANE_BORDER_SIZE: return m_border_size; case wxAUI_DOCKART_PANE_BORDER_SIZE: return m_border_size;
case wxAUI_ART_PANE_BUTTON_SIZE: return m_button_size; case wxAUI_DOCKART_PANE_BUTTON_SIZE: return m_button_size;
case wxAUI_ART_GRADIENT_TYPE: return m_gradient_type; case wxAUI_DOCKART_GRADIENT_TYPE: return m_gradient_type;
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
} }
@@ -338,12 +338,12 @@ void wxAuiDefaultDockArt::SetMetric(int id, int new_val)
{ {
switch (id) switch (id)
{ {
case wxAUI_ART_SASH_SIZE: m_sash_size = new_val; break; case wxAUI_DOCKART_SASH_SIZE: m_sash_size = new_val; break;
case wxAUI_ART_CAPTION_SIZE: m_caption_size = new_val; break; case wxAUI_DOCKART_CAPTION_SIZE: m_caption_size = new_val; break;
case wxAUI_ART_GRIPPER_SIZE: m_gripper_size = new_val; break; case wxAUI_DOCKART_GRIPPER_SIZE: m_gripper_size = new_val; break;
case wxAUI_ART_PANE_BORDER_SIZE: m_border_size = new_val; break; case wxAUI_DOCKART_PANE_BORDER_SIZE: m_border_size = new_val; break;
case wxAUI_ART_PANE_BUTTON_SIZE: m_button_size = new_val; break; case wxAUI_DOCKART_PANE_BUTTON_SIZE: m_button_size = new_val; break;
case wxAUI_ART_GRADIENT_TYPE: m_gradient_type = new_val; break; case wxAUI_DOCKART_GRADIENT_TYPE: m_gradient_type = new_val; break;
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
} }
} }
@@ -352,16 +352,16 @@ wxColour wxAuiDefaultDockArt::GetColour(int id)
{ {
switch (id) switch (id)
{ {
case wxAUI_ART_BACKGROUND_COLOUR: return m_background_brush.GetColour(); case wxAUI_DOCKART_BACKGROUND_COLOUR: return m_background_brush.GetColour();
case wxAUI_ART_SASH_COLOUR: return m_sash_brush.GetColour(); case wxAUI_DOCKART_SASH_COLOUR: return m_sash_brush.GetColour();
case wxAUI_ART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour; case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: return m_inactive_caption_colour;
case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour; case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: return m_inactive_caption_gradient_colour;
case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour; case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: return m_inactive_caption_text_colour;
case wxAUI_ART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour; case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: return m_active_caption_colour;
case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour; case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: return m_active_caption_gradient_colour;
case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour; case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: return m_active_caption_text_colour;
case wxAUI_ART_BORDER_COLOUR: return m_border_pen.GetColour(); case wxAUI_DOCKART_BORDER_COLOUR: return m_border_pen.GetColour();
case wxAUI_ART_GRIPPER_COLOUR: return m_gripper_brush.GetColour(); case wxAUI_DOCKART_GRIPPER_COLOUR: return m_gripper_brush.GetColour();
default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break; default: wxFAIL_MSG(wxT("Invalid Metric Ordinal")); break;
} }
@@ -372,16 +372,16 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour)
{ {
switch (id) switch (id)
{ {
case wxAUI_ART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break; case wxAUI_DOCKART_BACKGROUND_COLOUR: m_background_brush.SetColour(colour); break;
case wxAUI_ART_SASH_COLOUR: m_sash_brush.SetColour(colour); break; case wxAUI_DOCKART_SASH_COLOUR: m_sash_brush.SetColour(colour); break;
case wxAUI_ART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break; case wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR: m_inactive_caption_colour = colour; break;
case wxAUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break; case wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR: m_inactive_caption_gradient_colour = colour; break;
case wxAUI_ART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break; case wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR: m_inactive_caption_text_colour = colour; break;
case wxAUI_ART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break; case wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR: m_active_caption_colour = colour; break;
case wxAUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break; case wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR: m_active_caption_gradient_colour = colour; break;
case wxAUI_ART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break; case wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR: m_active_caption_text_colour = colour; break;
case wxAUI_ART_BORDER_COLOUR: m_border_pen.SetColour(colour); break; case wxAUI_DOCKART_BORDER_COLOUR: m_border_pen.SetColour(colour); break;
case wxAUI_ART_GRIPPER_COLOUR: case wxAUI_DOCKART_GRIPPER_COLOUR:
m_gripper_brush.SetColour(colour); m_gripper_brush.SetColour(colour);
m_gripper_pen1.SetColour(wxAuiStepColour(colour, 40)); m_gripper_pen1.SetColour(wxAuiStepColour(colour, 40));
m_gripper_pen2.SetColour(wxAuiStepColour(colour, 60)); m_gripper_pen2.SetColour(wxAuiStepColour(colour, 60));
@@ -392,13 +392,13 @@ void wxAuiDefaultDockArt::SetColour(int id, const wxColor& colour)
void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font) void wxAuiDefaultDockArt::SetFont(int id, const wxFont& font)
{ {
if (id == wxAUI_ART_CAPTION_FONT) if (id == wxAUI_DOCKART_CAPTION_FONT)
m_caption_font = font; m_caption_font = font;
} }
wxFont wxAuiDefaultDockArt::GetFont(int id) wxFont wxAuiDefaultDockArt::GetFont(int id)
{ {
if (id == wxAUI_ART_CAPTION_FONT) if (id == wxAUI_DOCKART_CAPTION_FONT)
return m_caption_font; return m_caption_font;
return wxNullFont; return wxNullFont;
} }
@@ -502,7 +502,7 @@ void wxAuiDefaultDockArt::DrawBorder(wxDC& dc, wxWindow *WXUNUSED(window), const
dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetBrush(*wxTRANSPARENT_BRUSH);
wxRect rect = _rect; wxRect rect = _rect;
int i, border_width = GetMetric(wxAUI_ART_PANE_BORDER_SIZE); int i, border_width = GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
if (pane.IsToolbar()) if (pane.IsToolbar())
{ {

4
src/aui/floatpane.cpp
View File

@@ -122,9 +122,9 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
if (pane.HasGripper()) if (pane.HasGripper())
{ {
if (pane.HasGripperTop()) if (pane.HasGripperTop())
size.y += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE); size.y += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
else else
size.x += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE); size.x += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
} }
SetClientSize(size); SetClientSize(size);

26
src/aui/framemanager.cpp
View File

@@ -1399,9 +1399,9 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
wxArrayInt& positions, wxArrayInt& positions,
wxArrayInt& sizes) wxArrayInt& sizes)
{ {
int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE); int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE); int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE); int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
positions.Empty(); positions.Empty();
sizes.Empty(); sizes.Empty();
@@ -1495,10 +1495,10 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont,
wxAuiDockUIPart part; wxAuiDockUIPart part;
wxSizerItem* sizer_item; wxSizerItem* sizer_item;
int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE); int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE); int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE); int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
int pane_button_size = m_art->GetMetric(wxAUI_ART_PANE_BUTTON_SIZE); int pane_button_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BUTTON_SIZE);
// find out the orientation of the item (orientation for panes // find out the orientation of the item (orientation for panes
// is the same as the dock's orientation) // is the same as the dock's orientation)
@@ -1664,7 +1664,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
wxSizerItem* sizer_item; wxSizerItem* sizer_item;
wxAuiDockUIPart part; wxAuiDockUIPart part;
int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE); int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE);
int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL; int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL;
// resizable bottom and right docks have a sash before them // resizable bottom and right docks have a sash before them
@@ -1816,8 +1816,8 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
{ {
wxBoxSizer* container = new wxBoxSizer(wxVERTICAL); wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);
int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE); int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE); int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
wxSize cli_size = m_frame->GetClientSize(); wxSize cli_size = m_frame->GetClientSize();
int i, dock_count, pane_count; int i, dock_count, pane_count;
@@ -3741,9 +3741,9 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
int dock_pixels = 0; int dock_pixels = 0;
int new_pixsize = 0; int new_pixsize = 0;
int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE); int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE); int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE); int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE);
wxPoint new_pos(event.m_x - m_action_offset.x, wxPoint new_pos(event.m_x - m_action_offset.x,
event.m_y - m_action_offset.y); event.m_y - m_action_offset.y);

2
src/aui/tabmdi.cpp
View File

@@ -714,7 +714,7 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
wxColour bkcolour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); wxColour bkcolour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
SetOwnBackgroundColour(bkcolour); SetOwnBackgroundColour(bkcolour);
m_mgr.GetArtProvider()->SetColour(wxAUI_ART_BACKGROUND_COLOUR, bkcolour); m_mgr.GetArtProvider()->SetColour(wxAUI_DOCKART_BACKGROUND_COLOUR, bkcolour);
return true; return true;
} }