Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-18 08:11:26 +00:00
parent 8898456df4
commit 93763ad5ba
40 changed files with 429 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/dirdlgg.cpp
View File

@@ -13,11 +13,9 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/defs.h"
#if wxUSE_DIRDLG
#ifndef WX_PRECOMP

2
src/generic/grid.cpp
View File

@@ -12,8 +12,6 @@
// For compilers that support precompilatixon, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif

18
src/generic/gridsel.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// Name: generic/gridsel.cpp
// Name: src/generic/gridsel.cpp
// Purpose: wxGridSelection
// Author: Stefan Neis
// Modified by:
@@ -9,6 +9,13 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
// ============================================================================
// declarations
// ============================================================================
@@ -17,15 +24,6 @@
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_GRID
#include "wx/generic/gridsel.h"

8
src/generic/imaglist.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: generic/imaglist.cpp
// Name: src/generic/imaglist.cpp
// Purpose:
// Author: Robert Roebling
// Id: $id$
@@ -10,13 +10,11 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_IMAGLIST
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/defs.h"
#if wxUSE_IMAGLIST
#ifndef __WXPALMOS__

18
src/generic/printps.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: printps.cpp
// Name: src/generic/printps.cpp
// Purpose: Postscript print/preview framework
// Author: Julian Smart
// Modified by:
@@ -9,14 +9,6 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@ -24,7 +16,13 @@
#pragma hdrstop
#endif
#include "wx/defs.h"
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)

5
src/generic/propdlg.cpp
View File

@@ -13,11 +13,9 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/defs.h"
#if wxUSE_BOOKCTRL
#ifndef WX_PRECOMP
@@ -228,4 +226,3 @@ void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
}
#endif // wxUSE_BOOKCTRL

5
src/gtk/bitmap.cpp
View File

@@ -10,7 +10,9 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#endif
#include "wx/bitmap.h"
#include "wx/palette.h"
@@ -18,7 +20,6 @@
#include "wx/filefn.h"
#include "wx/image.h"
#include "wx/dcmemory.h"
#include "wx/app.h"
#include "wx/rawbmp.h"
// need this to get gdk_image_new_bitmap()

4
src/gtk/bmpbuttn.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/bmpbuttn.cpp
// Name: src/gtk/bmpbuttn.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_BMPBUTTON
#include "wx/bmpbuttn.h"

15
src/gtk/button.cpp
View File

@@ -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

24
src/gtk/checkbox.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: checkbox.cpp
// Name: src/gtk/checkbox.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_CHECKBOX
#include "wx/checkbox.h"
@@ -113,15 +111,15 @@ bool wxCheckBox::Create(wxWindow *parent,
const wxValidator& validator,
const wxString &name )
{
m_needParent = TRUE;
m_acceptsFocus = TRUE;
m_blockEvent = FALSE;
m_needParent = true;
m_acceptsFocus = true;
m_blockEvent = false;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxCheckBox creation failed") );
return FALSE;
return false;
}
wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
@@ -161,7 +159,7 @@ bool wxCheckBox::Create(wxWindow *parent,
PostCreation(size);
return TRUE;
return true;
}
void wxCheckBox::SetValue( bool state )
@@ -171,16 +169,16 @@ void wxCheckBox::SetValue( bool state )
if (state == GetValue())
return;
m_blockEvent = TRUE;
m_blockEvent = true;
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
m_blockEvent = FALSE;
m_blockEvent = false;
}
bool wxCheckBox::GetValue() const
{
wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") );
return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));
}
@@ -214,11 +212,11 @@ void wxCheckBox::SetLabel( const wxString& label )
bool wxCheckBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
return FALSE;
return false;
gtk_widget_set_sensitive( m_widgetLabel, enable );
return TRUE;
return true;
}
void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)

13
src/gtk/data.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/data.cpp
// Name: src/gtk/data.cpp
// Purpose: Various global GTK-specific data
// Author: Robert Roebling
// Id: $Id$
@@ -10,7 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/dc.h"
@@ -21,15 +20,15 @@
wxCursor g_globalCursor;
/* Don't allow event propagation during drag */
bool g_blockEventsOnDrag = FALSE;
bool g_blockEventsOnDrag = false;
/* Don't allow mouse event propagation during scroll */
bool g_blockEventsOnScroll = FALSE;
bool g_blockEventsOnScroll = false;
/* Don't allow window closing if there are open dialogs */
int g_openDialogs = 0;
/* TRUE when the message queue is empty. this gets set to
FALSE by all event callbacks before anything else is done */
bool g_isIdle = FALSE;
/* true when the message queue is empty. this gets set to
false by all event callbacks before anything else is done */
bool g_isIdle = false;

200
src/gtk/dataview.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dataview.cpp
// Name: src/gtk/dataview.cpp
// Purpose: wxDataViewCtrl GTK+2 implementation
// 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_DATAVIEWCTRL
#include "wx/dataview.h"
@@ -76,7 +74,6 @@ struct _GtkWxListStore
struct _GtkWxListStoreClass
{
GObjectClass list_parent_class;
};
static GtkWxListStore *wxgtk_list_store_new (void);
@@ -87,68 +84,68 @@ static void wxgtk_list_store_finalize (GObject *object)
static GtkTreeModelFlags wxgtk_list_store_get_flags (GtkTreeModel *tree_model);
static gint wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model);
static GType wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
gint index);
gint index);
static gboolean wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreePath *path);
GtkTreeIter *iter,
GtkTreePath *path);
static GtkTreePath *wxgtk_list_store_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter);
GtkTreeIter *iter);
static void wxgtk_list_store_get_value (GtkTreeModel *tree_model,
GtkTreeIter *iter,
gint column,
GValue *value);
GtkTreeIter *iter,
gint column,
GValue *value);
static gboolean wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter);
GtkTreeIter *iter);
static gboolean wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent);
GtkTreeIter *iter,
GtkTreeIter *parent);
static gboolean wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter);
GtkTreeIter *iter);
static gint wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter);
GtkTreeIter *iter);
static gboolean wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent,
gint n);
GtkTreeIter *iter,
GtkTreeIter *parent,
gint n);
static gboolean wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *child);
GtkTreeIter *iter,
GtkTreeIter *child);
static GObjectClass *list_parent_class = NULL;
GType
gtk_wx_list_store_get_type (void)
{
static GType list_store_type = 0;
static GType list_store_type = 0;
if (!list_store_type)
if (!list_store_type)
{
static const GTypeInfo list_store_info =
{
sizeof (GtkWxListStoreClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) wxgtk_list_store_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkWxListStore),
0,
(GInstanceInitFunc) wxgtk_list_store_init,
};
static const GTypeInfo list_store_info =
{
sizeof (GtkWxListStoreClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) wxgtk_list_store_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkWxListStore),
0,
(GInstanceInitFunc) wxgtk_list_store_init,
};
static const GInterfaceInfo tree_model_info =
{
(GInterfaceInitFunc) wxgtk_list_store_tree_model_init,
NULL,
NULL
(GInterfaceInitFunc) wxgtk_list_store_tree_model_init,
NULL,
NULL
};
list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkWxListStore",
&list_store_info, (GTypeFlags)0 );
&list_store_info, (GTypeFlags)0 );
g_type_add_interface_static (list_store_type,
GTK_TYPE_TREE_MODEL,
&tree_model_info);
GTK_TYPE_TREE_MODEL,
&tree_model_info);
}
return list_store_type;
@@ -238,7 +235,7 @@ wxgtk_list_store_get_n_columns (GtkTreeModel *tree_model)
static GType
wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
gint index)
gint index)
{
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID);
@@ -255,8 +252,8 @@ wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
static gboolean
wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreePath *path)
GtkTreeIter *iter,
GtkTreePath *path)
{
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
@@ -276,7 +273,7 @@ wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
static GtkTreePath *
wxgtk_list_store_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter)
GtkTreeIter *iter)
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), NULL);
g_return_val_if_fail (iter->stamp == GTK_WX_LIST_STORE (tree_model)->stamp, NULL);
@@ -290,9 +287,9 @@ wxgtk_list_store_get_path (GtkTreeModel *tree_model,
static void
wxgtk_list_store_get_value (GtkTreeModel *tree_model,
GtkTreeIter *iter,
gint column,
GValue *value)
GtkTreeIter *iter,
gint column,
GValue *value)
{
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
@@ -326,15 +323,15 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
else
_gtk_tree_data_list_node_to_value (list,
GTK_LIST_STORE (tree_model)->column_headers[column],
value);
GTK_LIST_STORE (tree_model)->column_headers[column],
value);
#endif
}
static gboolean
wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
GtkTreeIter *iter)
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
@@ -356,8 +353,8 @@ wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
static gboolean
wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent)
GtkTreeIter *iter,
GtkTreeIter *parent)
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
@@ -374,14 +371,14 @@ wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
static gboolean
wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
GtkTreeIter *iter)
{
return FALSE;
}
static gint
wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter)
GtkTreeIter *iter)
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
@@ -396,9 +393,9 @@ wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
static gboolean
wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent,
gint n)
GtkTreeIter *iter,
GtkTreeIter *parent,
gint n)
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
@@ -420,8 +417,8 @@ wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
static gboolean
wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *child)
GtkTreeIter *iter,
GtkTreeIter *child)
{
return FALSE;
}
@@ -468,20 +465,20 @@ static void gtk_wx_cell_renderer_finalize (
GObject *object );
static void gtk_wx_cell_renderer_get_size (
GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *rectangle,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height );
GtkWidget *widget,
GdkRectangle *rectangle,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height );
static void gtk_wx_cell_renderer_render (
GtkCellRenderer *cell,
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags );
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags );
static gboolean gtk_wx_cell_renderer_activate(
GtkCellRenderer *cell,
GdkEvent *event,
@@ -505,11 +502,11 @@ gtk_wx_cell_renderer_get_type (void)
static const GTypeInfo cell_wx_info =
{
sizeof (GtkWxCellRendererClass),
NULL, /* base_init */
NULL, /* base_finalize */
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gtk_wx_cell_renderer_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkWxCellRenderer),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_wx_cell_renderer_init,
@@ -559,12 +556,12 @@ gtk_wx_cell_renderer_new (void)
static void
gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
GtkWidget *widget,
GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height)
GtkWidget *widget,
GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height)
{
GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
wxDataViewCustomCell *cell = wxrenderer->cell;
@@ -582,11 +579,11 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
if (cell_area && size.x > 0 && size.y > 0)
{
if (x_offset)
{
{
*x_offset = (gint)((renderer->xalign *
(cell_area->width - calc_width - 2 * renderer->xpad)));
*x_offset = MAX (*x_offset, 0) + renderer->xpad;
}
}
if (y_offset)
{
*y_offset = (gint)((renderer->yalign *
@@ -604,12 +601,12 @@ gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
static void
gtk_wx_cell_renderer_render (GtkCellRenderer *renderer,
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags)
GdkWindow *window,
GtkWidget *widget,
GdkRectangle *background_area,
GdkRectangle *cell_area,
GdkRectangle *expose_area,
GtkCellRendererState flags)
{
GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
@@ -617,10 +614,10 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer,
GdkRectangle rect;
gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
&rect.x,
&rect.y,
&rect.width,
&rect.height);
&rect.x,
&rect.y,
&rect.width,
&rect.height);
rect.x += cell_area->x;
rect.y += cell_area->y;
@@ -668,10 +665,10 @@ gtk_wx_cell_renderer_activate(
GdkRectangle rect;
gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
&rect.x,
&rect.y,
&rect.width,
&rect.height);
&rect.x,
&rect.y,
&rect.width,
&rect.height);
rect.x += cell_area->x;
rect.y += cell_area->y;
@@ -1396,14 +1393,14 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
{
Init();
m_needParent = TRUE;
m_acceptsFocus = TRUE;
m_needParent = true;
m_acceptsFocus = true;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator ))
{
wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
return FALSE;
return false;
}
m_widget = gtk_scrolled_window_new (NULL, NULL);
@@ -1459,4 +1456,3 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
#endif
// wxUSE_DATAVIEWCTRL

13
src/gtk/fontdlg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/fontdlg.cpp
// Name: src/gtk/fontdlg.cpp
// Purpose: wxFontDialog
// 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_FONTDLG
#ifndef __WXGPE__
@@ -45,7 +43,7 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
win->Close();
return TRUE;
return true;
}
}
@@ -98,14 +96,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
bool wxFontDialog::DoCreate(wxWindow *parent)
{
m_needParent = FALSE;
m_needParent = false;
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
wxDefaultValidator, wxT("fontdialog") ))
{
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
return FALSE;
return false;
}
wxString m_message( _("Choose font") );
@@ -144,7 +142,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
}
}
return TRUE;
return true;
}
wxFontDialog::~wxFontDialog()
@@ -159,4 +157,3 @@ void wxFontDialog::SetChosenFont(const char *fontname)
#endif // wxUSE_FONTDLG
#endif // GPE

10
src/gtk/frame.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: frame.cpp
// Name: src/gtk/frame.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -7,6 +7,9 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// ============================================================================
// declarations
// ============================================================================
@@ -15,11 +18,6 @@
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/frame.h"
#include "wx/dialog.h"
#include "wx/control.h"

8
src/gtk/toplevel.cpp
View File

@@ -7,6 +7,9 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// ============================================================================
// declarations
// ============================================================================
@@ -15,15 +18,10 @@
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __VMS
#define XIconifyWindow XICONIFYWINDOW
#endif
#include "wx/defs.h"
#include "wx/toplevel.h"
#include "wx/log.h"
#include "wx/dialog.h"

5
src/gtk1/bmpbuttn.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/bmpbuttn.cpp
// Name: src/gtk1/bmpbuttn.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_BMPBUTTON
#include "wx/bmpbuttn.h"
@@ -275,4 +273,3 @@ void wxBitmapButton::EndSelect()
}
#endif // wxUSE_BMPBUTTON

15
src/gtk1/button.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: button.cpp
// Name: src/gtk1/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_label("");
@@ -193,11 +191,11 @@ void wxButton::SetLabel( const wxString &lbl )
bool wxButton::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
return FALSE;
return false;
gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
return TRUE;
return true;
}
bool wxButton::IsOwnGtkWindow( GdkWindow *window )
@@ -253,4 +251,3 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
}
#endif // wxUSE_BUTTON

24
src/gtk1/checkbox.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: checkbox.cpp
// Name: src/gtk1/checkbox.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_CHECKBOX
#include "wx/checkbox.h"
@@ -74,15 +72,15 @@ bool wxCheckBox::Create(wxWindow *parent,
const wxValidator& validator,
const wxString &name )
{
m_needParent = TRUE;
m_acceptsFocus = TRUE;
m_blockEvent = FALSE;
m_needParent = true;
m_acceptsFocus = true;
m_blockEvent = false;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxCheckBox creation failed") );
return FALSE;
return false;
}
wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
@@ -124,7 +122,7 @@ bool wxCheckBox::Create(wxWindow *parent,
PostCreation(size);
return TRUE;
return true;
}
void wxCheckBox::SetValue( bool state )
@@ -134,16 +132,16 @@ void wxCheckBox::SetValue( bool state )
if (state == GetValue())
return;
m_blockEvent = TRUE;
m_blockEvent = true;
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
m_blockEvent = FALSE;
m_blockEvent = false;
}
bool wxCheckBox::GetValue() const
{
wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") );
wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") );
return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
}
@@ -158,11 +156,11 @@ void wxCheckBox::SetLabel( const wxString& label )
bool wxCheckBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
return FALSE;
return false;
gtk_widget_set_sensitive( m_widgetLabel, enable );
return TRUE;
return true;
}
void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)

14
src/gtk1/data.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/data.cpp
// Name: src/gtk1/data.cpp
// Purpose: Various global GTK-specific data
// Author: Robert Roebling
// Id: $Id$
@@ -10,7 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/dc.h"
@@ -21,15 +20,14 @@
wxCursor g_globalCursor;
/* Don't allow event propagation during drag */
bool g_blockEventsOnDrag = FALSE;
bool g_blockEventsOnDrag = false;
/* Don't allow mouse event propagation during scroll */
bool g_blockEventsOnScroll = FALSE;
bool g_blockEventsOnScroll = false;
/* Don't allow window closing if there are open dialogs */
int g_openDialogs = 0;
/* TRUE when the message queue is empty. this gets set to
FALSE by all event callbacks before anything else is done */
bool g_isIdle = FALSE;
/* true when the message queue is empty. this gets set to
false by all event callbacks before anything else is done */
bool g_isIdle = false;

13
src/gtk1/fontdlg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/fontdlg.cpp
// Name: src/gtk1/fontdlg.cpp
// Purpose: wxFontDialog
// 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_FONTDLG
#ifndef __WXGPE__
@@ -52,7 +50,7 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
win->Close();
return TRUE;
return true;
}
}
@@ -114,14 +112,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
bool wxFontDialog::DoCreate(wxWindow *parent)
{
m_needParent = FALSE;
m_needParent = false;
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
wxDefaultValidator, wxT("fontdialog") ))
{
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
return FALSE;
return false;
}
wxString m_message( _("Choose font") );
@@ -169,7 +167,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
}
}
return TRUE;
return true;
}
wxFontDialog::~wxFontDialog()
@@ -184,4 +182,3 @@ void wxFontDialog::SetChosenFont(const char *fontname)
#endif // wxUSE_FONTDLG
#endif // GPE

10
src/gtk1/frame.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: frame.cpp
// Name: src/gtk1/frame.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -7,6 +7,9 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// ============================================================================
// declarations
// ============================================================================
@@ -15,11 +18,6 @@
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/frame.h"
#include "wx/dialog.h"
#include "wx/control.h"

8
src/gtk1/toplevel.cpp
View File

@@ -7,6 +7,9 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// ============================================================================
// declarations
// ============================================================================
@@ -15,15 +18,10 @@
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __VMS
#define XIconifyWindow XICONIFYWINDOW
#endif
#include "wx/defs.h"
#include "wx/toplevel.h"
#include "wx/log.h"
#include "wx/dialog.h"

20
src/html/helpdata.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: helpdata.cpp
// Name: src/html/helpdata.cpp
// Purpose: wxHtmlHelpData
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik
@@ -13,11 +13,9 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
@@ -294,7 +292,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys,
HP_TagHandler *handler = new HP_TagHandler(book);
parser.AddTagHandler(handler);
f = ( contentsfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
f = ( contentsfile.empty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
if (f)
{
buf.clear();
@@ -308,7 +306,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys,
wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
}
f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
f = ( indexfile.empty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
if (f)
{
buf.clear();
@@ -317,7 +315,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys,
handler->Reset(m_index);
parser.Parse(buf);
}
else if (!indexfile.IsEmpty())
else if (!indexfile.empty())
{
wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
}
@@ -488,7 +486,7 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
if (wxIsAbsolutePath(path)) m_tempPath = path;
else m_tempPath = wxGetCwd() + _T("/") + path;
if (m_tempPath[m_tempPath.Length() - 1] != _T('/'))
if (m_tempPath[m_tempPath.length() - 1] != _T('/'))
m_tempPath << _T('/');
}
}
@@ -518,7 +516,7 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
int IndexOld = m_index.size(),
ContentsOld = m_contents.size();
if (!path.IsEmpty())
if (!path.empty())
fsys.ChangePathTo(path, true);
size_t booksCnt = m_bookRecords.GetCount();
@@ -643,7 +641,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
#endif
s = fsys.FindFirst(book + wxT("#zip:*.hhp"), wxFILE);
while (!s.IsEmpty())
while (!s.empty())
{
if (AddBook(s)) rt = true;
s = fsys.FindNext();
@@ -989,7 +987,7 @@ bool wxHtmlSearchEngine::Scan(const wxFSFile& file)
wxASSERT_MSG(!m_Keyword.empty(), wxT("wxHtmlSearchEngine::LookFor must be called before scanning!"));
int i, j;
int wrd = m_Keyword.Length();
int wrd = m_Keyword.length();
bool found = false;
wxHtmlFilterHTML filter;
wxString tmp = filter.ReadFile(file);

12
src/html/htmlcell.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: htmlcell.cpp
// Name: src/html/htmlcell.cpp
// Purpose: wxHtmlCell - basic element of HTML output
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,14 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/colour.h"
@@ -1149,7 +1147,7 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale
int wdi;
wxString wd = tag.GetParam(wxT("WIDTH"));
if (wd[wd.Length()-1] == wxT('%'))
if (wd[wd.length()-1] == wxT('%'))
{
wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);

9
src/html/htmlfilt.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: htmlfilt.cpp
// Name: src/html/htmlfilt.cpp
// Purpose: wxHtmlFilter - input filter for translating into HTML format
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"

13
src/html/htmlpars.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: htmlpars.cpp
// Name: src/html/htmlpars.cpp
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"
@@ -135,7 +134,7 @@ void wxHtmlParser::CreateDOMTree()
{
wxHtmlTagsCache cache(m_Source);
m_TextPieces = new wxHtmlTextPieces;
CreateDOMSubTree(NULL, 0, m_Source.Length(), &cache);
CreateDOMSubTree(NULL, 0, m_Source.length(), &cache);
m_CurTextPiece = 0;
}
@@ -272,7 +271,7 @@ void wxHtmlParser::DoParsing()
{
m_CurTag = m_Tags;
m_CurTextPiece = 0;
DoParsing(0, m_Source.Length());
DoParsing(0, m_Source.length());
}
void wxHtmlParser::DoParsing(int begin_pos, int end_pos)

11
src/html/htmltag.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: htmltag.cpp
// Name: src/html/htmltag.cpp
// Purpose: wxHtmlTag class (represents single tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML
#ifndef WXPRECOMP
#endif
@@ -61,7 +60,7 @@ bool wxIsCDATAElement(const wxChar *tag)
wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
{
const wxChar *src = source.c_str();
int lng = source.Length();
int lng = source.length();
wxChar tagBuffer[256];
m_Cache = NULL;

9
src/html/htmlwin.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: htmlwin.cpp
// Name: src/html/htmlwin.cpp
// Purpose: wxHtmlWindow class for parsing & displaying HTML (implementation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"

10
src/html/htmprint.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: htmprint.cpp
// Name: src/html/htmprint.cpp
// Purpose: html printing classes
// Author: Vaclav Slavik
// Created: 25/09/99
@@ -11,20 +11,18 @@
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/dc.h"
#endif
#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
#include "wx/dc.h"
#include "wx/print.h"
#include "wx/printdlg.h"

9
src/html/m_dflist.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_dflist.cpp
// Name: src/html/m_dflist.cpp
// Purpose: wxHtml module for definition lists (DL,DT,DD)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#endif

9
src/html/m_fonts.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_fonts.cpp
// Name: src/html/m_fonts.cpp
// Purpose: wxHtml module for fonts & colors of fonts
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#endif

8
src/html/m_hline.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_hline.cpp
// Name: src/html/m_hline.cpp
// Purpose: wxHtml module for horizontal line (HR tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,12 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/pen.h"

9
src/html/m_image.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_image.cpp
// Name: src/html/m_image.cpp
// Purpose: wxHtml module for displaying images
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/dc.h"
#include "wx/scrolwin.h"

8
src/html/m_layout.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_layout.cpp
// Name: src/html/m_layout.cpp
// Purpose: wxHtml module for basic paragraphs/layout handling
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,14 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#endif

9
src/html/m_links.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_links.cpp
// Name: src/html/m_links.cpp
// Purpose: wxHtml module for links & anchors
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#endif

9
src/html/m_list.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_list.cpp
// Name: src/html/m_list.cpp
// Purpose: wxHtml module for lists
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/dc.h"

8
src/html/m_pre.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_pre.cpp
// Name: src/html/m_pre.cpp
// Purpose: wxHtml module for <PRE> ... </PRE> tag (code citation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,12 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#endif

9
src/html/m_style.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_style.cpp
// Name: src/html/m_style.cpp
// Purpose: wxHtml module for parsing <style> tag
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#endif

12
src/html/m_tables.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: m_tables.cpp
// Name: src/html/m_tables.cpp
// Purpose: wxHtml module for tables
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,12 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#endif
@@ -275,7 +275,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
{
wxString wd = tag.GetParam(wxT("WIDTH"));
if (wd[wd.Length()-1] == wxT('%'))
if (wd[wd.length()-1] == wxT('%'))
{
wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width);
m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
@@ -680,7 +680,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
{
wxString wd = tag.GetParam(wxT("WIDTH"));
if (wd[wd.Length()-1] == wxT('%'))
if (wd[wd.length()-1] == wxT('%'))
{
int width = 0;
wxSscanf(wd.c_str(), wxT("%i%%"), &width);

10
src/html/winpars.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: winpars.cpp
// Name: src/html/winpars.cpp
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -9,13 +9,12 @@
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#include "wx/intl.h"
#include "wx/dc.h"
@@ -602,4 +601,3 @@ void wxHtmlTagsModule::OnExit()
}
#endif