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

indentation cleanup, unused variables, constant expressions, etc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-07-04 20:54:36 +00:00
parent cde76cf2a9
commit cedd7b22f4
7 changed files with 175 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,7 @@ public:
*this = source; *this = source;
} }
bool IsOk() const { return (window != NULL) ? true : false; } bool IsOk() const { return window != NULL; }
bool IsFixed() const { return !HasFlag(optionResizable); } bool IsFixed() const { return !HasFlag(optionResizable); }
bool IsResizable() const { return HasFlag(optionResizable); } bool IsResizable() const { return HasFlag(optionResizable); }
bool IsShown() const { return !HasFlag(optionHidden); } bool IsShown() const { return !HasFlag(optionHidden); }
@@ -334,14 +334,14 @@ public:
{ {
if (option_state) if (option_state)
state |= flag; state |= flag;
else else
state &= ~flag; state &= ~flag;
return *this; return *this;
} }
bool HasFlag(unsigned int flag) const bool HasFlag(unsigned int flag) const
{ {
return (state & flag) ? true:false; return (state & flag) != 0;
} }
#ifdef SWIG #ifdef SWIG
@@ -739,12 +739,12 @@ public:
} }
#endif // SWIG #endif // SWIG
bool IsOk() const { return (dock_direction != 0) ? true : false; } bool IsOk() const { return dock_direction != 0; }
bool IsHorizontal() const { return (dock_direction == wxAUI_DOCK_TOP || bool IsHorizontal() const { return dock_direction == wxAUI_DOCK_TOP ||
dock_direction == wxAUI_DOCK_BOTTOM) ? true:false; } dock_direction == wxAUI_DOCK_BOTTOM; }
bool IsVertical() const { return (dock_direction == wxAUI_DOCK_LEFT || bool IsVertical() const { return dock_direction == wxAUI_DOCK_LEFT ||
dock_direction == wxAUI_DOCK_RIGHT || dock_direction == wxAUI_DOCK_RIGHT ||
dock_direction == wxAUI_DOCK_CENTER) ? true:false; } dock_direction == wxAUI_DOCK_CENTER; }
public: public:
wxAuiPaneInfoPtrArray panes; // array of panes wxAuiPaneInfoPtrArray panes; // array of panes
wxRect rect; // current rectangle wxRect rect; // current rectangle

3
include/wx/aui/tabmdi.h
View File

@@ -154,6 +154,8 @@ public:
virtual void Activate(); virtual void Activate();
virtual bool Destroy(); virtual bool Destroy();
virtual bool Show(bool show = true);
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// no status bars // no status bars
virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1, virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
@@ -204,7 +206,6 @@ public:
protected: protected:
void Init(); void Init();
virtual bool Show(bool show = true);
virtual void DoSetSize(int x, int y, int width, int height, int size_flags); virtual void DoSetSize(int x, int y, int width, int height, int size_flags);
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);

113
src/aui/auibook.cpp
View File

@@ -317,7 +317,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
{ {
wxCoord normal_textx, normal_texty; wxCoord normal_textx, normal_texty;
wxCoord selected_textx, selected_texty; wxCoord selected_textx, selected_texty;
wxCoord textx, texty; wxCoord texty;
// if the caption is empty, measure some temporary text // if the caption is empty, measure some temporary text
wxString caption = page.caption; wxString caption = page.caption;
@@ -353,13 +353,11 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
if (page.active) if (page.active)
{ {
dc.SetFont(m_selected_font); dc.SetFont(m_selected_font);
textx = selected_textx;
texty = selected_texty; texty = selected_texty;
} }
else else
{ {
dc.SetFont(m_normal_font); dc.SetFont(m_normal_font);
textx = normal_textx;
texty = normal_texty; texty = normal_texty;
} }
@@ -436,7 +434,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
wxColor bottom_color = m_base_colour; wxColor bottom_color = m_base_colour;
dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH); dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
} }
else else
{ {
// draw inactive tab // draw inactive tab
@@ -474,7 +472,6 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
// this gets rid of the top one of those lines in the tab control // this gets rid of the top one of those lines in the tab control
if (page.active) if (page.active)
{ {
wxColor start_color = m_base_colour;
dc.SetPen(m_base_colour_pen); dc.SetPen(m_base_colour_pen);
dc.DrawLine(border_points[0].x+1, dc.DrawLine(border_points[0].x+1,
border_points[0].y, border_points[0].y,
@@ -504,7 +501,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
text_offset = bitmap_offset + page.bitmap.GetWidth(); text_offset = bitmap_offset + page.bitmap.GetWidth();
text_offset += 3; // bitmap padding text_offset += 3; // bitmap padding
} }
else else
{ {
text_offset = tab_x + 8; text_offset = tab_x + 8;
} }
@@ -615,25 +612,25 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
case wxAUI_BUTTON_CLOSE: case wxAUI_BUTTON_CLOSE:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_close_bmp; bmp = m_disabled_close_bmp;
else else
bmp = m_active_close_bmp; bmp = m_active_close_bmp;
break; break;
case wxAUI_BUTTON_LEFT: case wxAUI_BUTTON_LEFT:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_left_bmp; bmp = m_disabled_left_bmp;
else else
bmp = m_active_left_bmp; bmp = m_active_left_bmp;
break; break;
case wxAUI_BUTTON_RIGHT: case wxAUI_BUTTON_RIGHT:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_right_bmp; bmp = m_disabled_right_bmp;
else else
bmp = m_active_right_bmp; bmp = m_active_right_bmp;
break; break;
case wxAUI_BUTTON_WINDOWLIST: case wxAUI_BUTTON_WINDOWLIST:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_windowlist_bmp; bmp = m_disabled_windowlist_bmp;
else else
bmp = m_active_windowlist_bmp; bmp = m_active_windowlist_bmp;
break; break;
} }
@@ -651,7 +648,7 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc,
rect.SetWidth(bmp.GetWidth()); rect.SetWidth(bmp.GetWidth());
rect.SetHeight(bmp.GetHeight()); rect.SetHeight(bmp.GetHeight());
} }
else else
{ {
rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2), ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
@@ -737,7 +734,7 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
wxBitmap bmp; wxBitmap bmp;
if (measure_bmp.IsOk()) if (measure_bmp.IsOk())
bmp = measure_bmp; bmp = measure_bmp;
else else
bmp = page.bitmap; bmp = page.bitmap;
// we don't use the caption text because we don't // we don't use the caption text because we don't
@@ -930,7 +927,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
textx = selected_textx; textx = selected_textx;
texty = selected_texty; texty = selected_texty;
} }
else else
{ {
dc.SetPen(m_normal_bkpen); dc.SetPen(m_normal_bkpen);
dc.SetBrush(m_normal_bkbrush); dc.SetBrush(m_normal_bkbrush);
@@ -975,7 +972,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
close_button_width = m_active_close_bmp.GetWidth(); close_button_width = m_active_close_bmp.GetWidth();
text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2); text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2);
} }
else else
{ {
text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2); text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2);
} }
@@ -1001,7 +998,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
wxBitmap bmp; wxBitmap bmp;
if (page.active) if (page.active)
bmp = m_active_close_bmp; bmp = m_active_close_bmp;
else else
bmp = m_disabled_close_bmp; bmp = m_disabled_close_bmp;
wxRect rect(tab_x + tab_width - close_button_width - 1, wxRect rect(tab_x + tab_width - close_button_width - 1,
@@ -1070,25 +1067,25 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
case wxAUI_BUTTON_CLOSE: case wxAUI_BUTTON_CLOSE:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_close_bmp; bmp = m_disabled_close_bmp;
else else
bmp = m_active_close_bmp; bmp = m_active_close_bmp;
break; break;
case wxAUI_BUTTON_LEFT: case wxAUI_BUTTON_LEFT:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_left_bmp; bmp = m_disabled_left_bmp;
else else
bmp = m_active_left_bmp; bmp = m_active_left_bmp;
break; break;
case wxAUI_BUTTON_RIGHT: case wxAUI_BUTTON_RIGHT:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_right_bmp; bmp = m_disabled_right_bmp;
else else
bmp = m_active_right_bmp; bmp = m_active_right_bmp;
break; break;
case wxAUI_BUTTON_WINDOWLIST: case wxAUI_BUTTON_WINDOWLIST:
if (button_state & wxAUI_BUTTON_STATE_DISABLED) if (button_state & wxAUI_BUTTON_STATE_DISABLED)
bmp = m_disabled_windowlist_bmp; bmp = m_disabled_windowlist_bmp;
else else
bmp = m_active_windowlist_bmp; bmp = m_active_windowlist_bmp;
break; break;
} }
@@ -1105,7 +1102,7 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc,
rect.SetWidth(bmp.GetWidth()); rect.SetWidth(bmp.GetWidth());
rect.SetHeight(bmp.GetHeight()); rect.SetHeight(bmp.GetHeight());
} }
else else
{ {
rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2), ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
@@ -1144,7 +1141,7 @@ int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
pt = wnd->ScreenToClient(pt); pt = wnd->ScreenToClient(pt);
if (pt.x < 100) if (pt.x < 100)
pt.x = 0; pt.x = 0;
else else
pt.x -= 100; pt.x -= 100;
// find out the screen coordinate at the bottom of the tab ctrl // find out the screen coordinate at the bottom of the tab ctrl
@@ -1336,7 +1333,7 @@ bool wxAuiTabContainer::InsertPage(wxWindow* page,
if (idx >= m_pages.GetCount()) if (idx >= m_pages.GetCount())
m_pages.Add(page_info); m_pages.Add(page_info);
else else
m_pages.Insert(page_info, idx); m_pages.Insert(page_info, idx);
// let the art provider know how many pages we have // let the art provider know how many pages we have
@@ -1403,7 +1400,7 @@ bool wxAuiTabContainer::SetActivePage(wxWindow* wnd)
page.active = true; page.active = true;
found = true; found = true;
} }
else else
{ {
page.active = false; page.active = false;
} }
@@ -1582,14 +1579,14 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
if (i+1 < page_count) if (i+1 < page_count)
total_width += x_extent; total_width += x_extent;
else else
total_width += size.x; total_width += size.x;
if (i >= m_tab_offset) if (i >= m_tab_offset)
{ {
if (i+1 < page_count) if (i+1 < page_count)
visible_width += x_extent; visible_width += x_extent;
else else
visible_width += size.x; visible_width += size.x;
} }
} }
@@ -1607,7 +1604,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
} }
} }
} }
else else
{ {
// hide left/right buttons // hide left/right buttons
for (i = 0; i < button_count; ++i) for (i = 0; i < button_count; ++i)
@@ -1629,14 +1626,14 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
{ {
if (m_tab_offset == 0) if (m_tab_offset == 0)
button.cur_state |= wxAUI_BUTTON_STATE_DISABLED; button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
else else
button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED; button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
} }
if (button.id == wxAUI_BUTTON_RIGHT) if (button.id == wxAUI_BUTTON_RIGHT)
{ {
if (visible_width < m_rect.GetWidth() - ((int)button_count*16)) if (visible_width < m_rect.GetWidth() - ((int)button_count*16))
button.cur_state |= wxAUI_BUTTON_STATE_DISABLED; button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
else else
button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED; button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
} }
} }
@@ -1754,11 +1751,9 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i); wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i);
// determine if a close button is on this tab // determine if a close button is on this tab
bool close_button = false;
if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 || if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 ||
((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active)) ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active))
{ {
close_button = true;
if (tab_button.cur_state == wxAUI_BUTTON_STATE_HIDDEN) if (tab_button.cur_state == wxAUI_BUTTON_STATE_HIDDEN)
{ {
tab_button.id = wxAUI_BUTTON_CLOSE; tab_button.id = wxAUI_BUTTON_CLOSE;
@@ -1766,7 +1761,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
tab_button.location = wxCENTER; tab_button.location = wxCENTER;
} }
} }
else else
{ {
tab_button.cur_state = wxAUI_BUTTON_STATE_HIDDEN; tab_button.cur_state = wxAUI_BUTTON_STATE_HIDDEN;
} }
@@ -1811,14 +1806,6 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(active); wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(active);
// determine if a close button is on this tab
bool close_button = false;
if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 ||
((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active))
{
close_button = true;
}
rect.x = active_offset; rect.x = active_offset;
m_art->DrawTab(dc, m_art->DrawTab(dc,
wnd, wnd,
@@ -1922,7 +1909,7 @@ static void ShowWnd(wxWindow* wnd, bool show)
wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd; wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd;
cf->DoShow(show); cf->DoShow(show);
} }
else else
{ {
wnd->Show(show); wnd->Show(show);
} }
@@ -2184,7 +2171,7 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt)
return; return;
} }
} }
else else
{ {
if (m_hover_button) if (m_hover_button)
{ {
@@ -2252,14 +2239,14 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
Update(); Update();
} }
} }
else else
{ {
SetTabOffset(GetTabOffset()+1); SetTabOffset(GetTabOffset()+1);
Refresh(); Refresh();
Update(); Update();
} }
} }
else if (button == wxAUI_BUTTON_WINDOWLIST) else if (button == wxAUI_BUTTON_WINDOWLIST)
{ {
int idx = GetArtProvider()->ShowDropDown(this, m_pages, GetActivePage()); int idx = GetArtProvider()->ShowDropDown(this, m_pages, GetActivePage());
@@ -2272,7 +2259,7 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
GetEventHandler()->ProcessEvent(e); GetEventHandler()->ProcessEvent(e);
} }
} }
else else
{ {
event.Skip(); event.Skip();
} }
@@ -2297,16 +2284,17 @@ public:
m_tab_ctrl_height = 20; m_tab_ctrl_height = 20;
} }
~wxTabFrame() ~wxTabFrame()
{ {
wxDELETE(m_tabs); wxDELETE(m_tabs);
} }
void SetTabCtrlHeight(int h) void SetTabCtrlHeight(int h)
{ {
m_tab_ctrl_height = h; m_tab_ctrl_height = h;
} }
protected:
void DoSetSize(int x, int y, void DoSetSize(int x, int y,
int width, int height, int width, int height,
int WXUNUSED(sizeFlags = wxSIZE_AUTO)) int WXUNUSED(sizeFlags = wxSIZE_AUTO))
@@ -2321,6 +2309,7 @@ public:
*y = m_rect.height; *y = m_rect.height;
} }
public:
bool Show( bool WXUNUSED(show = true) ) { return false; } bool Show( bool WXUNUSED(show = true) ) { return false; }
void DoSizing() void DoSizing()
@@ -2351,6 +2340,7 @@ public:
} }
} }
protected:
void DoGetSize(int* x, int* y) const void DoGetSize(int* x, int* y) const
{ {
if (x) if (x)
@@ -2359,13 +2349,12 @@ public:
*y = m_rect.GetHeight(); *y = m_rect.GetHeight();
} }
public:
void Update() void Update()
{ {
// does nothing // does nothing
} }
public:
wxRect m_rect; wxRect m_rect;
wxRect m_tab_rect; wxRect m_tab_rect;
wxAuiTabCtrl* m_tabs; wxAuiTabCtrl* m_tabs;
@@ -2596,7 +2585,7 @@ wxSize wxAuiNotebook::CalculateNewSplitSize()
new_split_size.x /= 2; new_split_size.x /= 2;
new_split_size.y /= 2; new_split_size.y /= 2;
} }
else else
{ {
// this is in place of a more complicated calculation // this is in place of a more complicated calculation
// that needs to be implemented // that needs to be implemented
@@ -2694,7 +2683,7 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl(); wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl();
if (page_idx >= active_tabctrl->GetPageCount()) if (page_idx >= active_tabctrl->GetPageCount())
active_tabctrl->AddPage(page, info); active_tabctrl->AddPage(page, info);
else else
active_tabctrl->InsertPage(page, info, page_idx); active_tabctrl->InsertPage(page, info, page_idx);
UpdateTabCtrlHeight(); UpdateTabCtrlHeight();
@@ -2734,7 +2723,7 @@ bool wxAuiNotebook::DeletePage(size_t page_idx)
if (!wxPendingDelete.Member(wnd)) if (!wxPendingDelete.Member(wnd))
wxPendingDelete.Append(wnd); wxPendingDelete.Append(wnd);
} }
else else
{ {
wnd->Destroy(); wnd->Destroy();
} }
@@ -2799,7 +2788,7 @@ bool wxAuiNotebook::RemovePage(size_t page_idx)
} }
} }
} }
else else
{ {
// we are not deleting the active page, so keep it the same // we are not deleting the active page, so keep it the same
new_active = active_wnd; new_active = active_wnd;
@@ -2971,7 +2960,7 @@ size_t wxAuiNotebook::SetSelection(size_t new_page)
wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs; wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs;
if (tabctrl != ctrl) if (tabctrl != ctrl)
tabctrl->SetSelectedFont(m_normal_font); tabctrl->SetSelectedFont(m_normal_font);
else else
tabctrl->SetSelectedFont(m_selected_font); tabctrl->SetSelectedFont(m_selected_font);
tabctrl->Refresh(); tabctrl->Refresh();
} }
@@ -3125,7 +3114,7 @@ void wxAuiNotebook::Split(size_t page, int direction)
{ {
split_size = CalculateNewSplitSize(); split_size = CalculateNewSplitSize();
} }
else else
{ {
// because there are two panes, always split them // because there are two panes, always split them
// equally // equally
@@ -3158,17 +3147,17 @@ void wxAuiNotebook::Split(size_t page, int direction)
pane_info.Left(); pane_info.Left();
mouse_pt = wxPoint(0, cli_size.y/2); mouse_pt = wxPoint(0, cli_size.y/2);
} }
else if (direction == wxRIGHT) else if (direction == wxRIGHT)
{ {
pane_info.Right(); pane_info.Right();
mouse_pt = wxPoint(cli_size.x, cli_size.y/2); mouse_pt = wxPoint(cli_size.x, cli_size.y/2);
} }
else if (direction == wxTOP) else if (direction == wxTOP)
{ {
pane_info.Top(); pane_info.Top();
mouse_pt = wxPoint(cli_size.x/2, 0); mouse_pt = wxPoint(cli_size.x/2, 0);
} }
else if (direction == wxBOTTOM) else if (direction == wxBOTTOM)
{ {
pane_info.Bottom(); pane_info.Bottom();
mouse_pt = wxPoint(cli_size.x/2, cli_size.y); mouse_pt = wxPoint(cli_size.x/2, cli_size.y);
@@ -3326,7 +3315,7 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
} }
} }
} }
else else
{ {
if (!dest_tabs) if (!dest_tabs)
{ {
@@ -3359,7 +3348,7 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt)
ClientToScreen(&hint_rect.x, &hint_rect.y); ClientToScreen(&hint_rect.x, &hint_rect.y);
m_mgr.ShowHint(hint_rect); m_mgr.ShowHint(hint_rect);
} }
else else
{ {
m_mgr.DrawHintRect(m_dummy_wnd, client_pt, zero); m_mgr.DrawHintRect(m_dummy_wnd, client_pt, zero);
} }

32
src/aui/dockart.cpp
View File

@@ -92,7 +92,7 @@ wxColor wxAuiStepColour(const wxColor& c, int ialpha)
bg = 255.0; bg = 255.0;
alpha = 1.0 - alpha; // 0 = transparent fg; 1 = opaque fg alpha = 1.0 - alpha; // 0 = transparent fg; 1 = opaque fg
} }
else else
{ {
// blend with black // blend with black
bg = 0.0; bg = 0.0;
@@ -145,7 +145,7 @@ static void DrawGradientRectangle(wxDC& dc,
if (direction == wxAUI_GRADIENT_VERTICAL) if (direction == wxAUI_GRADIENT_VERTICAL)
high = rect.GetHeight()-1; high = rect.GetHeight()-1;
else else
high = rect.GetWidth()-1; high = rect.GetWidth()-1;
for (int i = 0; i <= high; ++i) for (int i = 0; i <= high; ++i)
@@ -164,7 +164,7 @@ static void DrawGradientRectangle(wxDC& dc,
if (direction == wxAUI_GRADIENT_VERTICAL) if (direction == wxAUI_GRADIENT_VERTICAL)
dc.DrawLine(rect.x, rect.y+i, rect.x+rect.width, rect.y+i); dc.DrawLine(rect.x, rect.y+i, rect.x+rect.width, rect.y+i);
else else
dc.DrawLine(rect.x+i, rect.y, rect.x+i, rect.y+rect.height); dc.DrawLine(rect.x+i, rect.y, rect.x+i, rect.y+rect.height);
} }
} }
@@ -220,7 +220,7 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
wxColor darker1_colour = wxAuiStepColour(base_colour, 85); wxColor darker1_colour = wxAuiStepColour(base_colour, 85);
wxColor darker2_colour = wxAuiStepColour(base_colour, 75); wxColor darker2_colour = wxAuiStepColour(base_colour, 75);
wxColor darker3_colour = wxAuiStepColour(base_colour, 60); wxColor darker3_colour = wxAuiStepColour(base_colour, 60);
wxColor darker4_colour = wxAuiStepColour(base_colour, 50); //wxColor darker4_colour = wxAuiStepColour(base_colour, 50);
wxColor darker5_colour = wxAuiStepColour(base_colour, 40); wxColor darker5_colour = wxAuiStepColour(base_colour, 40);
m_active_caption_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); m_active_caption_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
@@ -256,7 +256,7 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3, 0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF }; 0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
#elif defined( __WXGTK__) #elif defined(__WXGTK__)
static unsigned char close_bits[]={ static unsigned char close_bits[]={
0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8, 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef, 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
@@ -444,6 +444,7 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation,
dc.SetBrush(m_sash_brush); dc.SetBrush(m_sash_brush);
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
#if 0
GdkRectangle gdk_rect; GdkRectangle gdk_rect;
if (orientation == wxVERTICAL ) if (orientation == wxVERTICAL )
{ {
@@ -459,6 +460,7 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation,
gdk_rect.width = rect.width; gdk_rect.width = rect.width;
gdk_rect.height = m_sash_size; gdk_rect.height = m_sash_size;
} }
#endif
if (!window) return; if (!window) return;
if (!window->m_wxwindow) return; if (!window->m_wxwindow) return;
@@ -545,7 +547,7 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo
{ {
if (active) if (active)
dc.SetBrush(wxBrush(m_active_caption_colour)); dc.SetBrush(wxBrush(m_active_caption_colour));
else else
dc.SetBrush(wxBrush(m_inactive_caption_colour)); dc.SetBrush(wxBrush(m_inactive_caption_colour));
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
@@ -568,7 +570,7 @@ void wxAuiDefaultDockArt::DrawCaptionBackground(wxDC& dc, const wxRect& rect, bo
m_gradient_type); m_gradient_type);
#endif #endif
} }
else else
{ {
#ifdef __WXMAC__ #ifdef __WXMAC__
// on mac the gradients are expected to become darker from the top // on mac the gradients are expected to become darker from the top
@@ -683,21 +685,21 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window),
wxAuiPaneInfo& pane) wxAuiPaneInfo& pane)
{ {
wxBitmap bmp; wxBitmap bmp;
if (!(&pane)) if (!(&pane))
return; return;
switch (button) switch (button)
{ {
default: default:
case wxAUI_BUTTON_CLOSE: case wxAUI_BUTTON_CLOSE:
if (pane.state & wxAuiPaneInfo::optionActive) if (pane.state & wxAuiPaneInfo::optionActive)
bmp = m_active_close_bitmap; bmp = m_active_close_bitmap;
else else
bmp = m_inactive_close_bitmap; bmp = m_inactive_close_bitmap;
break; break;
case wxAUI_BUTTON_PIN: case wxAUI_BUTTON_PIN:
if (pane.state & wxAuiPaneInfo::optionActive) if (pane.state & wxAuiPaneInfo::optionActive)
bmp = m_active_pin_bitmap; bmp = m_active_pin_bitmap;
else else
bmp = m_inactive_pin_bitmap; bmp = m_inactive_pin_bitmap;
break; break;
case wxAUI_BUTTON_MAXIMIZE_RESTORE: case wxAUI_BUTTON_MAXIMIZE_RESTORE:
@@ -705,14 +707,14 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window),
{ {
if (pane.state & wxAuiPaneInfo::optionActive) if (pane.state & wxAuiPaneInfo::optionActive)
bmp = m_active_restore_bitmap; bmp = m_active_restore_bitmap;
else else
bmp = m_inactive_restore_bitmap; bmp = m_inactive_restore_bitmap;
} }
else else
{ {
if (pane.state & wxAuiPaneInfo::optionActive) if (pane.state & wxAuiPaneInfo::optionActive)
bmp = m_active_maximize_bitmap; bmp = m_active_maximize_bitmap;
else else
bmp = m_inactive_maximize_bitmap; bmp = m_inactive_maximize_bitmap;
} }
break; break;
@@ -740,7 +742,7 @@ void wxAuiDefaultDockArt::DrawPaneButton(wxDC& dc, wxWindow *WXUNUSED(window),
dc.SetBrush(wxBrush(wxAuiStepColour(m_active_caption_colour, 120))); dc.SetBrush(wxBrush(wxAuiStepColour(m_active_caption_colour, 120)));
dc.SetPen(wxPen(wxAuiStepColour(m_active_caption_colour, 70))); dc.SetPen(wxPen(wxAuiStepColour(m_active_caption_colour, 70)));
} }
else else
{ {
dc.SetBrush(wxBrush(wxAuiStepColour(m_inactive_caption_colour, 120))); dc.SetBrush(wxBrush(wxAuiStepColour(m_inactive_caption_colour, 120)));
dc.SetPen(wxPen(wxAuiStepColour(m_inactive_caption_colour, 70))); dc.SetPen(wxPen(wxAuiStepColour(m_inactive_caption_colour, 70)));

6
src/aui/floatpane.cpp
View File

@@ -126,7 +126,7 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
{ {
SetSize(pane.floating_size); SetSize(pane.floating_size);
} }
else else
{ {
wxSize size = pane.best_size; wxSize size = pane.best_size;
if (size == wxDefaultSize) if (size == wxDefaultSize)
@@ -160,7 +160,7 @@ void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt)
{ {
m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt); m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt);
if (!evt.GetVeto()) { if (!evt.GetVeto()) {
m_mgr.DetachPane(m_pane_window); m_mgr.DetachPane(m_pane_window);
Destroy(); Destroy();
} }
} }
@@ -261,7 +261,7 @@ void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event)
m_moving = false; m_moving = false;
OnMoveFinished(); OnMoveFinished();
} }
else else
{ {
event.RequestMore(); event.RequestMore();
} }

74
src/aui/framemanager.cpp
View File

@@ -152,7 +152,7 @@ public:
wxRect rect(upd.GetRect()); wxRect rect(upd.GetRect());
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
upd++; ++upd;
} }
} }
@@ -770,7 +770,7 @@ void wxAuiManager::SetManagedWindow(wxWindow* wnd)
wxAuiPaneInfo().Name(wxT("mdiclient")). wxAuiPaneInfo().Name(wxT("mdiclient")).
CenterPane().PaneBorder(false)); CenterPane().PaneBorder(false));
} }
else if (m_frame->IsKindOf(CLASSINFO(wxAuiMDIParentFrame))) else if (m_frame->IsKindOf(CLASSINFO(wxAuiMDIParentFrame)))
{ {
wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame; wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame;
wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow(); wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow();
@@ -2304,21 +2304,21 @@ void wxAuiManager::Update()
p.window->SetSize(1,1); p.window->SetSize(1,1);
// the following block is a workaround for bug #1531361 // the following block is a workaround for bug #1531361
// (see wxWidgets sourceforge page). On wxGTK (only), when // (see wxWidgets sourceforge page). On wxGTK (only), when
// a frame is shown/hidden, a move event unfortunately // a frame is shown/hidden, a move event unfortunately
// also gets fired. Because we may be dragging around // also gets fired. Because we may be dragging around
// a pane, we need to cancel that action here to prevent // a pane, we need to cancel that action here to prevent
// a spurious crash. // a spurious crash.
if (m_action_window == p.frame) if (m_action_window == p.frame)
{ {
if (wxWindow::GetCapture() == m_frame) if (wxWindow::GetCapture() == m_frame)
m_frame->ReleaseMouse(); m_frame->ReleaseMouse();
m_action = actionNone; m_action = actionNone;
m_action_window = NULL; m_action_window = NULL;
} }
// hide the frame // hide the frame
if (p.frame->IsShown()) if (p.frame->IsShown())
p.frame->Show(false); p.frame->Show(false);
@@ -2774,16 +2774,11 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
return ProcessDockResult(target, drop); return ProcessDockResult(target, drop);
} }
else
{
m_skipping = false;
}
if (!m_skipping) m_skipping = false;
{
m_last_rect = part->dock->rect; m_last_rect = part->dock->rect;
m_last_rect.Inflate( 15, 15 ); m_last_rect.Inflate( 15, 15 );
}
drop.Dock(). drop.Dock().
Direction(part->dock->dock_direction). Direction(part->dock->dock_direction).
@@ -3371,27 +3366,24 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
// no hint for toolbar floating windows // no hint for toolbar floating windows
if (pane.IsToolbar() && m_action == actionDragFloatingPane) if (pane.IsToolbar() && m_action == actionDragFloatingPane)
{ {
if (m_action == actionDragFloatingPane) wxAuiDockInfoArray docks;
{ wxAuiPaneInfoArray panes;
wxAuiDockInfoArray docks; wxAuiDockUIPartArray uiparts;
wxAuiPaneInfoArray panes; wxAuiPaneInfo hint = pane;
wxAuiDockUIPartArray uiparts;
wxAuiPaneInfo hint = pane;
CopyDocksAndPanes(docks, panes, m_docks, m_panes); CopyDocksAndPanes(docks, panes, m_docks, m_panes);
// find out where the new pane would be // find out where the new pane would be
if (!DoDrop(docks, panes, hint, client_pt)) if (!DoDrop(docks, panes, hint, client_pt))
return; return;
if (hint.IsFloating()) if (hint.IsFloating())
return; return;
pane = hint; pane = hint;
m_action = actionDragToolbarPane; m_action = actionDragToolbarPane;
m_action_window = pane.window; m_action_window = pane.window;
Update(); Update();
}
return; return;
} }
@@ -3555,7 +3547,7 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
{ {
// if the frame is about to be deleted, don't bother // if the frame is about to be deleted, don't bother
if (!m_frame || wxPendingDelete.Member(m_frame)) if (!m_frame || wxPendingDelete.Member(m_frame))
return; return;
wxDC* dc = evt.GetDC(); wxDC* dc = evt.GetDC();

16
src/aui/tabmdi.cpp
View File

@@ -179,13 +179,13 @@ void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild)
// No Child, set Our menu bar back. // No Child, set Our menu bar back.
if (m_pMyMenuBar) if (m_pMyMenuBar)
SetMenuBar(m_pMyMenuBar); SetMenuBar(m_pMyMenuBar);
else else
SetMenuBar(GetMenuBar()); SetMenuBar(GetMenuBar());
// Make sure we know our menu bar is in use // Make sure we know our menu bar is in use
m_pMyMenuBar = NULL; m_pMyMenuBar = NULL;
} }
else else
{ {
if (pChild->GetMenuBar() == NULL) if (pChild->GetMenuBar() == NULL)
return; return;
@@ -314,7 +314,7 @@ void wxAuiMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS)); int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));
if (pos == wxNOT_FOUND) if (pos == wxNOT_FOUND)
pMenuBar->Append(m_pWindowMenu, _("&Window")); pMenuBar->Append(m_pWindowMenu, _("&Window"));
else else
pMenuBar->Insert(pos, m_pWindowMenu, _("&Window")); pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
} }
} }
@@ -366,7 +366,7 @@ void wxAuiMDIParentFrame::Tile(wxOrientation orient)
{ {
client_window->Split(cur_idx, wxLEFT); client_window->Split(cur_idx, wxLEFT);
} }
else if (orient == wxHORIZONTAL) else if (orient == wxHORIZONTAL)
{ {
client_window->Split(cur_idx, wxTOP); client_window->Split(cur_idx, wxTOP);
} }
@@ -446,10 +446,10 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
// create the window off-screen to prevent flicker // create the window off-screen to prevent flicker
wxPanel::Create(pClientWindow, wxPanel::Create(pClientWindow,
id, id,
wxPoint(cli_size.x+1, cli_size.y+1), wxPoint(cli_size.x+1, cli_size.y+1),
size, size,
wxNO_BORDER, name); wxNO_BORDER, name);
DoShow(false); DoShow(false);