Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-02 10:39:23 +00:00
parent a8461d3170
commit de6185e212
138 changed files with 642 additions and 534 deletions

View File

@@ -17,10 +17,10 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#endif
#include "wx/panel.h"
#include "wx/utils.h"
#include "wx/imaglist.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
@@ -100,7 +100,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
wxCHECK_RET( !notebook->m_inSwitchPage,
_T("gtk_notebook_page_change_callback reentered") );
notebook->m_inSwitchPage = TRUE;
notebook->m_inSwitchPage = true;
if (g_isIdle)
wxapp_install_idle_handler();
@@ -292,11 +292,11 @@ END_EVENT_TABLE()
void wxNotebook::Init()
{
m_padding = 0;
m_inSwitchPage = FALSE;
m_inSwitchPage = false;
m_imageList = (wxImageList *) NULL;
m_selection = -1;
m_themeEnabled = TRUE;
m_themeEnabled = true;
}
wxNotebook::wxNotebook()
@@ -321,15 +321,15 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name )
{
m_needParent = TRUE;
m_acceptsFocus = TRUE;
m_needParent = true;
m_acceptsFocus = true;
m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxNoteBook creation failed") );
return FALSE;
return false;
}
@@ -357,7 +357,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
return TRUE;
return true;
}
int wxNotebook::GetSelection() const
@@ -446,7 +446,7 @@ bool wxNotebook::SetPageText( size_t page, const wxString &text )
gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
return TRUE;
return true;
}
bool wxNotebook::SetPageImage( size_t page, int image )
@@ -461,7 +461,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
* Not enabled because it may break existing (stupid) code that
* manipulates the imagelist to cycle images */
/* if (image == nb_page->m_image) return TRUE; */
/* if (image == nb_page->m_image) return true; */
/* For different cases:
1) no image -> no image
@@ -470,7 +470,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
4) image -> image */
if (image == -1 && nb_page->m_image == -1)
return TRUE; /* Case 1): Nothing to do. */
return true; /* Case 1): Nothing to do. */
GtkWidget *pixmapwid = (GtkWidget*) NULL;
@@ -498,7 +498,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
nb_page->m_image = -1;
return TRUE; /* Case 2) */
return true; /* Case 2) */
}
}
@@ -531,7 +531,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
nb_page->m_image = image;
return TRUE;
return true;
}
void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
@@ -644,7 +644,7 @@ bool wxNotebook::InsertPage( size_t position,
GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
if (m_themeEnabled)
win->SetThemeEnabled(TRUE);
win->SetThemeEnabled(true);
GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
@@ -716,7 +716,7 @@ bool wxNotebook::InsertPage( size_t position,
GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
InvalidateBestSize();
return TRUE;
return true;
}
// helper for HitTest(): check if the point lies inside the given widget which
@@ -819,7 +819,7 @@ void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
{
return TRUE;
return true;
}
#endif