Added variant.h/cpp; changed variable names in object.h; added some
functions to wxStringList; some bugs fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -198,6 +198,10 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
|
||||
dragRect = wxRect(xp, yp, newWidth, h);
|
||||
break;
|
||||
}
|
||||
case wxSASH_NONE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
wxSashEvent event(GetId(), edge);
|
||||
@@ -271,7 +275,7 @@ void wxSashWindow::OnSize(wxSizeEvent& WXUNUSED(event))
|
||||
SizeWindows();
|
||||
}
|
||||
|
||||
wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int tolerance)
|
||||
wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int WXUNUSED(tolerance))
|
||||
{
|
||||
int cx, cy;
|
||||
GetClientSize(& cx, & cy);
|
||||
@@ -310,6 +314,10 @@ wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int tolerance)
|
||||
return wxSASH_LEFT;
|
||||
break;
|
||||
}
|
||||
case wxSASH_NONE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -570,7 +578,7 @@ void wxSashWindow::InitColours()
|
||||
m_hilightColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT);
|
||||
#else
|
||||
m_faceColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
|
||||
m_mediumShadowColour = *(wxTheColourDatabase->FindColour("GREY", 1, wxSOLID));
|
||||
m_mediumShadowColour = *(wxTheColourDatabase->FindColour("GREY"));
|
||||
m_darkShadowColour = *(wxTheColourDatabase->FindColour("BLACK"));
|
||||
m_lightShadowColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
|
||||
m_hilightColour = *(wxTheColourDatabase->FindColour("WHITE"));
|
||||
|
Reference in New Issue
Block a user