applied patch #929947: "Various cleaning of warnings under MSW"; removed some tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -73,8 +73,8 @@ public:
|
||||
|
||||
// Overridables
|
||||
// Start/end copying
|
||||
virtual bool OnStartCopy(wxDiagram* diagramTo) { return TRUE; };
|
||||
virtual bool OnEndCopy(wxDiagram* diagramTo) { return TRUE; };
|
||||
virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
|
||||
virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
|
||||
|
||||
// Override this to e.g. have the shape added through a Do/Undo command system.
|
||||
// By default, we'll just add it directly to the destination diagram, and
|
||||
@@ -97,10 +97,10 @@ public:
|
||||
~csDiagramClipboard() {}
|
||||
|
||||
// Start/end copying
|
||||
bool OnStartCopy(wxDiagram* diagramTo);
|
||||
bool OnEndCopy(wxDiagram* diagramTo);
|
||||
virtual bool OnStartCopy(wxDiagram* diagramTo);
|
||||
virtual bool OnEndCopy(wxDiagram* diagramTo);
|
||||
|
||||
bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
|
||||
virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
|
||||
|
||||
protected:
|
||||
csDiagramCommand* m_currentCmd;
|
||||
|
@@ -594,7 +594,7 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p
|
||||
wxRealPoint *second_last_line_point = (wxRealPoint *)second_last_line_node->GetData();
|
||||
|
||||
// Position where we want to start drawing
|
||||
double positionOnLineX, positionOnLineY;
|
||||
double positionOnLineX = 0.0, positionOnLineY = 0.0;
|
||||
|
||||
// Position of start point of line, at the end of which we draw the arrow.
|
||||
double startPositionX = 0.0 , startPositionY = 0.0;
|
||||
@@ -1090,8 +1090,8 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
|
||||
|
||||
// Do each end - nothing in the middle. User has to move other points
|
||||
// manually if necessary.
|
||||
double end_x, end_y;
|
||||
double other_end_x, other_end_y;
|
||||
double end_x = 0.0, end_y = 0.0;
|
||||
double other_end_x = 0.0, other_end_y = 0.0;
|
||||
|
||||
wxNode *first = m_lineControlPoints->GetFirst();
|
||||
/* wxRealPoint *first_point = */ (wxRealPoint *)first->GetData();
|
||||
|
@@ -989,7 +989,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
|
||||
wxString s = GetParamValue(param);
|
||||
if (s.IsEmpty()) s = wxT("-1,-1");
|
||||
bool is_dlg;
|
||||
long sx, sy;
|
||||
long sx, sy = 0;
|
||||
|
||||
is_dlg = s[s.Length()-1] == wxT('d');
|
||||
if (is_dlg) s.RemoveLast();
|
||||
|
@@ -123,7 +123,7 @@ class NodeHandlerUnknown : public NodeHandler
|
||||
public:
|
||||
NodeHandlerUnknown() : NodeHandler(new NodeInfo) {}
|
||||
|
||||
virtual bool CanHandle(wxXmlNode *node) { return TRUE; }
|
||||
virtual bool CanHandle(wxXmlNode *WXUNUSED(node)) { return TRUE; }
|
||||
};
|
||||
|
||||
|
||||
|
@@ -192,13 +192,13 @@ class PropEditCtrlCoordXY : public PropEditCtrlInt
|
||||
return m_c[m_which];
|
||||
}
|
||||
|
||||
virtual wxString GetPropName(const PropertyInfo& pinfo)
|
||||
virtual wxString GetPropName(const PropertyInfo& WXUNUSED(pinfo))
|
||||
{
|
||||
if (m_which == 0) return _T("x"); else return _T("y");
|
||||
}
|
||||
|
||||
virtual bool HasClearButton() { return FALSE; }
|
||||
virtual bool IsPresent(const PropertyInfo& pinfo) { return FALSE; }
|
||||
virtual bool IsPresent(const PropertyInfo& WXUNUSED(pinfo)) { return FALSE; }
|
||||
|
||||
|
||||
protected:
|
||||
@@ -243,13 +243,13 @@ class PropEditCtrlCoordDlg : public PropEditCtrlBool
|
||||
return _("true");
|
||||
}
|
||||
|
||||
virtual wxString GetPropName(const PropertyInfo& pinfo)
|
||||
virtual wxString GetPropName(const PropertyInfo& WXUNUSED(pinfo))
|
||||
{
|
||||
return _T("dlg");
|
||||
}
|
||||
|
||||
virtual bool HasClearButton() { return FALSE; }
|
||||
virtual bool IsPresent(const PropertyInfo& pinfo) { return FALSE; }
|
||||
virtual bool IsPresent(const PropertyInfo& WXUNUSED(pinfo)) { return FALSE; }
|
||||
};
|
||||
|
||||
|
||||
@@ -318,13 +318,13 @@ class PropEditCtrlDimX : public PropEditCtrlInt
|
||||
return XmlReadValue(GetNode(), pi->Name).BeforeFirst(_T('d'));
|
||||
}
|
||||
|
||||
virtual wxString GetPropName(const PropertyInfo& pinfo)
|
||||
virtual wxString GetPropName(const PropertyInfo& WXUNUSED(pinfo))
|
||||
{
|
||||
return _T("val");
|
||||
}
|
||||
|
||||
virtual bool HasClearButton() { return FALSE; }
|
||||
virtual bool IsPresent(const PropertyInfo& pinfo) { return FALSE; }
|
||||
virtual bool IsPresent(const PropertyInfo& WXUNUSED(pinfo)) { return FALSE; }
|
||||
|
||||
|
||||
protected:
|
||||
|
@@ -26,7 +26,7 @@ class PropEditCtrlNull : public PropEditCtrl
|
||||
PropEditCtrlNull(PropertiesFrame *propFrame)
|
||||
: PropEditCtrl(propFrame) {}
|
||||
|
||||
virtual void BeginEdit(const wxRect& rect, wxTreeItemId ti) {}
|
||||
virtual void BeginEdit(const wxRect& WXUNUSED(rect), wxTreeItemId WXUNUSED(ti)) {}
|
||||
virtual void EndEdit() {}
|
||||
|
||||
virtual wxWindow* CreateEditCtrl() {return NULL;}
|
||||
|
Reference in New Issue
Block a user