projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't refresh the current cell in SetCellHighlightROPenWidth() if it's invalid (...
[wxWidgets.git]
/
src
/
xrc
/
xh_split.cpp
diff --git
a/src/xrc/xh_split.cpp
b/src/xrc/xh_split.cpp
index f9e89a36bdc5ec0bd38da43a73a8037448aae5a2..fd219118089c2eb66f37ec5e7bd899e62910b6d7 100644
(file)
--- a/
src/xrc/xh_split.cpp
+++ b/
src/xrc/xh_split.cpp
@@
-15,11
+15,15
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_XRC
+#if wxUSE_XRC
&& wxUSE_SPLITTER
#include "wx/xrc/xh_split.h"
#include "wx/xrc/xh_split.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+#endif
+
#include "wx/splitter.h"
#include "wx/splitter.h"
-#include "wx/log.h"
IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindowXmlHandler, wxXmlResourceHandler)
@@
-53,8
+57,11
@@
wxObject *wxSplitterWindowXmlHandler::DoCreateResource()
long sashpos = GetLong(wxT("sashpos"), 0);
long minpanesize = GetLong(wxT("minsize"), -1);
long sashpos = GetLong(wxT("sashpos"), 0);
long minpanesize = GetLong(wxT("minsize"), -1);
+ float gravity = GetFloat(wxT("gravity"), 0.0);
if (minpanesize != -1)
if (minpanesize != -1)
- splitter->SetMinimumPaneSize(minpanesize);
+ splitter->SetMinimumPaneSize(minpanesize);
+ if (gravity != 0.0)
+ splitter->SetSashGravity(gravity);
wxWindow *win1 = NULL, *win2 = NULL;
wxXmlNode *n = m_node->GetChildren();
wxWindow *win1 = NULL, *win2 = NULL;
wxXmlNode *n = m_node->GetChildren();
@@
-103,4
+110,4
@@
bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxSplitterWindow"));
}
return IsOfClass(node, wxT("wxSplitterWindow"));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_SPLITTER