Added a few #if wxUSE_XXX
Regrouped image format handlers Updated the rest accordingly Added changes.txt for wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -57,6 +57,7 @@ libwx_gtk_la_SOURCES = \
|
||||
helpbase.cpp \
|
||||
http.cpp \
|
||||
image.cpp \
|
||||
imagbmp.cpp \
|
||||
imaggif.cpp \
|
||||
imagjpeg.cpp \
|
||||
imagpng.cpp \
|
||||
|
@@ -122,7 +122,9 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
|
||||
|
||||
PreCreation( parent, id, pos, newSize, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_bitmap = bitmap;
|
||||
m_disabled = bitmap;
|
||||
|
@@ -82,7 +82,10 @@ bool wxCheckBox::Create(wxWindow *parent,
|
||||
|
||||
m_blockFirstEvent = FALSE;
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
wxControl::SetLabel( label );
|
||||
|
||||
if ( style & wxALIGN_RIGHT )
|
||||
|
@@ -14,6 +14,8 @@
|
||||
|
||||
#include "wx/choice.h"
|
||||
|
||||
#if wxUSE_CHOICE
|
||||
|
||||
#include "gdk/gdk.h"
|
||||
#include "gtk/gtk.h"
|
||||
|
||||
@@ -71,7 +73,9 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_widget = gtk_option_menu_new();
|
||||
|
||||
@@ -388,3 +392,4 @@ void wxChoice::ApplyWidgetStyle()
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@@ -104,7 +104,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_widget = gtk_combo_new();
|
||||
|
||||
|
@@ -32,7 +32,9 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id, int range,
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
SetValidator( validator );
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_rangeMax = range;
|
||||
m_gaugePos = 0;
|
||||
|
@@ -246,7 +246,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
|
||||
if (style & wxLB_ALWAYS_SB)
|
||||
|
@@ -87,7 +87,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_widget = gtk_frame_new( title.mbc_str() );
|
||||
|
||||
|
@@ -74,7 +74,9 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
|
||||
|
||||
PreCreation( parent, id, pos, newSize, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label.mbc_str() );
|
||||
|
||||
|
@@ -139,7 +139,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_oldPos = 0.0;
|
||||
|
||||
|
@@ -100,7 +100,9 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator( validator );
|
||||
#endif
|
||||
|
||||
m_oldPos = 0.0;
|
||||
|
||||
|
Reference in New Issue
Block a user