wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: button.cpp
|
||||
// Name: src/gtk/button.cpp
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
@@ -10,8 +10,6 @@
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_BUTTON
|
||||
|
||||
#include "wx/button.h"
|
||||
@@ -107,14 +105,14 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
|
||||
const wxPoint &pos, const wxSize &size,
|
||||
long style, const wxValidator& validator, const wxString &name )
|
||||
{
|
||||
m_needParent = TRUE;
|
||||
m_acceptsFocus = TRUE;
|
||||
m_needParent = true;
|
||||
m_acceptsFocus = true;
|
||||
|
||||
if (!PreCreation( parent, pos, size ) ||
|
||||
!CreateBase( parent, id, pos, size, style, validator, name ))
|
||||
{
|
||||
wxFAIL_MSG( wxT("wxButton creation failed") );
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
m_widget = gtk_button_new_with_mnemonic("");
|
||||
@@ -247,11 +245,11 @@ void wxButton::SetLabel( const wxString &lbl )
|
||||
bool wxButton::Enable( bool enable )
|
||||
{
|
||||
if ( !wxControl::Enable( enable ) )
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxButton::IsOwnGtkWindow( GdkWindow *window )
|
||||
@@ -305,4 +303,3 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
|
||||
}
|
||||
|
||||
#endif // wxUSE_BUTTON
|
||||
|
||||
|
Reference in New Issue
Block a user