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

Merge pull request #27 from orbitcowboy/master

Browse Source 
No real changes, fixed typos in comments.
This commit is contained in:
Bryan Petty
2015-05-20 08:21:19 -06:00
parent 928e0fb577 1f66d274f8
commit 42469a4fc1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/aui/framemanager.cpp
View File

@@ -899,7 +899,7 @@ void wxAuiManager::UpdateHintWindowConfig()
// SetManagedWindow() is usually called once when the frame // SetManagedWindow() is usually called once when the frame
// manager class is being initialized. "frame" specifies // manager class is being initialized. "frame" specifies
// the frame which should be managed by the frame mananger // the frame which should be managed by the frame manager
void wxAuiManager::SetManagedWindow(wxWindow* wnd) void wxAuiManager::SetManagedWindow(wxWindow* wnd)
{ {
wxASSERT_MSG(wnd, wxT("specified window must be non-NULL")); wxASSERT_MSG(wnd, wxT("specified window must be non-NULL"));
@@ -1458,7 +1458,7 @@ wxString wxAuiManager::SavePaneInfo(wxAuiPaneInfo& pane)
return result; return result;
} }
// Load a "pane" with the pane infor settings in pane_part // Load a "pane" with the pane information settings in pane_part
void wxAuiManager::LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane) void wxAuiManager::LoadPaneInfo(wxString pane_part, wxAuiPaneInfo &pane)
{ {
// replace escaped characters so we can // replace escaped characters so we can
@@ -1899,8 +1899,8 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont,
} }
// add the verticle sizer (caption, pane window) to the // add the vertical sizer (caption, pane window) to the
// horizontal sizer (gripper, verticle sizer) // horizontal sizer (gripper, vertical sizer)
horz_pane_sizer->Add(vert_pane_sizer, 1, wxEXPAND); horz_pane_sizer->Add(vert_pane_sizer, 1, wxEXPAND);
// finally, add the pane sizer to the dock sizer // finally, add the pane sizer to the dock sizer
@@ -2680,7 +2680,7 @@ void wxAuiManager::Update()
/* /*
// N.B. More work needs to be done on frame minimum sizes; // N.B. More work needs to be done on frame minimum sizes;
// this is some intresting code that imposes the minimum size, // this is some interesting code that imposes the minimum size,
// but we may want to include a more flexible mechanism or // but we may want to include a more flexible mechanism or
// options for multiple minimum-size modes, e.g. strict or lax // options for multiple minimum-size modes, e.g. strict or lax
wxSize min_size = sizer->GetMinSize(); wxSize min_size = sizer->GetMinSize();
@@ -2782,7 +2782,7 @@ wxAuiDockUIPart* wxAuiManager::GetPanePart(wxWindow* wnd)
// a dock's offset in pixels from the left side of the window // a dock's offset in pixels from the left side of the window
// (for horizontal docks) or from the top of the window (for // (for horizontal docks) or from the top of the window (for
// vertical docks). This value is necessary for calculating // vertical docks). This value is necessary for calculating
// fixel-pane/toolbar offsets when they are dragged. // pixel-pane/toolbar offsets when they are dragged.
int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test) int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test)
{ {
@@ -4392,7 +4392,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event)
} }
// for some reason, an arithmatic error somewhere is causing // for some reason, an arithmetic error somewhere is causing
// the proportion calculations to always be off by 1 pixel; // the proportion calculations to always be off by 1 pixel;
// for now we will add the 1 pixel on, but we really should // for now we will add the 1 pixel on, but we really should
// determine what's causing this. // determine what's causing this.
@@ -4669,7 +4669,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
pt.y - m_actionOffset.y); pt.y - m_actionOffset.y);
} }
// this will do the actiual move operation; // this will do the actual move operation;
// in the case that the pane has been floated, // in the case that the pane has been floated,
// this call will create the floating pane // this call will create the floating pane
// and do the reparenting // and do the reparenting

2
src/aui/tabart.cpp
View File

@@ -454,7 +454,7 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
wxRect r(tab_x, tab_y+1, tab_width, tab_height-3); wxRect r(tab_x, tab_y+1, tab_width, tab_height-3);
// start the gradent up a bit and leave the inside border inset // start the gradient up a bit and leave the inside border inset
// by a pixel for a 3D look. Only the top half of the inactive // by a pixel for a 3D look. Only the top half of the inactive
// tab will have a slight gradient // tab will have a slight gradient
r.x += 3; r.x += 3;