projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid crashes when creating initially hidden MDI child under Unity.
[wxWidgets.git]
/
src
/
gtk1
/
statline.cpp
diff --git
a/src/gtk1/statline.cpp
b/src/gtk1/statline.cpp
index cd67c8a642a6fa0a2452765ff2b2227cdc658b04..ae6aa2dfeddf9040cbb6dddc67b82b04c03bd738 100644
(file)
--- a/
src/gtk1/statline.cpp
+++ b/
src/gtk1/statline.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: statline.cpp
+// Name: s
rc/gtk1/s
tatline.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,9
+7,8
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "statline.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/statline.h"
#include "wx/statline.h"
@@
-22,8
+21,6
@@
// wxStaticLine
//-----------------------------------------------------------------------------
// wxStaticLine
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
wxStaticLine::wxStaticLine()
{
}
wxStaticLine::wxStaticLine()
{
}
@@
-44,38
+41,43
@@
bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
- wxFAIL_MSG(
_
T("wxStaticLine creation failed") );
- return FALSE;
+ wxFAIL_MSG(
wx
T("wxStaticLine creation failed") );
+
return FALSE;
}
if ( IsVertical() )
{
m_widget = gtk_vseparator_new();
}
if ( IsVertical() )
{
m_widget = gtk_vseparator_new();
- if (size.x == -1)
- {
- wxSize new_size( size );
- new_size.x = 4;
- SetSize( new_size );
- }
+
if (size.x == -1)
+
{
+
wxSize new_size( size );
+
new_size.x = 4;
+
SetSize( new_size );
+
}
}
else
{
m_widget = gtk_hseparator_new();
}
else
{
m_widget = gtk_hseparator_new();
- if (size.y == -1)
- {
- wxSize new_size( size );
- new_size.y = 4;
- SetSize( new_size );
- }
+
if (size.y == -1)
+
{
+
wxSize new_size( size );
+
new_size.y = 4;
+
SetSize( new_size );
+
}
}
m_parent->DoAddChild( this );
}
m_parent->DoAddChild( this );
- PostCreation();
-
- Show( TRUE );
+ PostCreation(size);
return TRUE;
}
return TRUE;
}
+// static
+wxVisualAttributes
+wxStaticLine::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_vseparator_new);
+}
+
#endif
#endif