first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions

View File

@@ -11,10 +11,12 @@
#pragma implementation "statbox.h"
#endif
#include "wx/statbox.h"
#include "wx/defs.h"
#if wxUSE_STATBOX
#include "wx/statbox.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@ -45,22 +47,22 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxStaticBox creation failed") );
return FALSE;
return FALSE;
}
m_isStaticBox = TRUE;
if (label.IsEmpty())
m_widget = gtk_frame_new( (char*) NULL );
else
m_widget = gtk_frame_new( m_label.mbc_str() );
m_parent->DoAddChild( this );
PostCreation();
SetLabel(label);
SetFont( parent->GetFont() );
SetBackgroundColour( parent->GetBackgroundColour() );
@@ -84,4 +86,4 @@ void wxStaticBox::ApplyWidgetStyle()
gtk_widget_set_style( m_widget, m_widgetStyle );
}
#endif
#endif // wxUSE_STATBOX