projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 579219 ] wxNotebook:SetPadding added
[wxWidgets.git]
/
src
/
gtk1
/
stattext.cpp
diff --git
a/src/gtk1/stattext.cpp
b/src/gtk1/stattext.cpp
index 54d7366a4f4f360500edd220f2de037225edcd96..e57480771477c32fae0096240239b6f9926c968f 100644
(file)
--- a/
src/gtk1/stattext.cpp
+++ b/
src/gtk1/stattext.cpp
@@
-12,7
+12,12
@@
#pragma implementation "stattext.h"
#endif
#pragma implementation "stattext.h"
#endif
+#include "wx/defs.h"
+
+#if wxUSE_STATTEXT
+
#include "wx/stattext.h"
#include "wx/stattext.h"
+#include "wx/gtk/private.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@
-81,7
+86,7
@@
bool wxStaticText::Create(wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation();
m_parent->DoAddChild( this );
PostCreation();
-
+
ApplyWidgetStyle();
wxControl::SetFont( parent->GetFont() );
ApplyWidgetStyle();
wxControl::SetFont( parent->GetFont() );
@@
-150,9
+155,10
@@
wxSize wxStaticText::DoGetBestSize() const
GtkRequisition req;
req.width = 2;
req.height = 2;
GtkRequisition req;
req.width = 2;
req.height = 2;
- (* GTK_WIDGET_CLASS( GTK_OBJECT
(m_widget)->klass
)->size_request )
+ (* GTK_WIDGET_CLASS( GTK_OBJECT
_GET_CLASS(m_widget)
)->size_request )
(m_widget, &req );
return wxSize(req.width, req.height);
}
(m_widget, &req );
return wxSize(req.width, req.height);
}
+#endif // wxUSE_STATTEXT