projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vc6 did not like this (void function returning a value)
[wxWidgets.git]
/
src
/
generic
/
splitter.cpp
diff --git
a/src/generic/splitter.cpp
b/src/generic/splitter.cpp
index 6e084f1696e5cd895820a1d8b2a3b7b9317921b3..958de8cc0bcf1e076fd676530c289fd6327196fb 100644
(file)
--- a/
src/generic/splitter.cpp
+++ b/
src/generic/splitter.cpp
@@
-107,7
+107,7
@@
bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
void wxSplitterWindow::Init()
{
void wxSplitterWindow::Init()
{
-
m_container.SetContainerWindow(this
);
+
WX_INIT_CONTROL_CONTAINER(
);
m_splitMode = wxSPLIT_VERTICAL;
m_permitUnsplitAlways = true;
m_splitMode = wxSPLIT_VERTICAL;
m_permitUnsplitAlways = true;
@@
-884,9
+884,9
@@
wxSize wxSplitterWindow::DoGetBestSize() const
// get best sizes of subwindows
wxSize size1, size2;
if ( m_windowOne )
// get best sizes of subwindows
wxSize size1, size2;
if ( m_windowOne )
- size1 = m_windowOne->Get
AdjustedBest
Size();
+ size1 = m_windowOne->Get
EffectiveMin
Size();
if ( m_windowTwo )
if ( m_windowTwo )
- size2 = m_windowTwo->Get
AdjustedBest
Size();
+ size2 = m_windowTwo->Get
EffectiveMin
Size();
// sum them
//
// sum them
//