projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use GetFont not m_font for GetCharHeight
[wxWidgets.git]
/
src
/
gtk
/
statline.cpp
diff --git
a/src/gtk/statline.cpp
b/src/gtk/statline.cpp
index eb9374713cb9e440b858625bc242ddeb13500467..0e05c9e758d6b988a9c4d0f03d2f845fc798983f 100644
(file)
--- a/
src/gtk/statline.cpp
+++ b/
src/gtk/statline.cpp
@@
-4,12
+4,11
@@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// 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,39
+21,65
@@
// wxStaticLine
//-----------------------------------------------------------------------------
// wxStaticLine
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticLine,
wxControl)
-wxStaticLine::wxStaticLine(
void
)
+wxStaticLine::wxStaticLine()
{
}
wxStaticLine::wxStaticLine( wxWindow *parent, wxWindowID id,
{
}
wxStaticLine::wxStaticLine( wxWindow *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- long style, const wxString &name )
+ const wxPoint &pos, const wxSize &size,
+
long style, const wxString &name )
{
Create( parent, id, pos, size, style, name );
}
{
Create( parent, id, pos, size, style, name );
}
-bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- long style, const wxString &name )
+bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+
long style, const wxString &name )
{
m_needParent = TRUE;
{
m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
- if (style & wxVERTICAL)
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxStaticLine creation failed") );
+ return FALSE;
+ }
+
+ if ( IsVertical() )
+ {
m_widget = gtk_vseparator_new();
m_widget = gtk_vseparator_new();
+ if (size.x == -1)
+ {
+ wxSize new_size( size );
+ new_size.x = 4;
+ SetSize( new_size );
+ }
+ }
else
else
+ {
m_widget = gtk_hseparator_new();
m_widget = gtk_hseparator_new();
-
+ 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;
}
-#endif
\ No newline at end of file
+// static
+wxVisualAttributes
+wxStaticLine::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_vseparator_new);
+}
+
+#endif