git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
40 files changed:
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_DIRDLG
#ifndef WX_PRECOMP
#if wxUSE_DIRDLG
#ifndef WX_PRECOMP
// For compilers that support precompilatixon, includes "wx/wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilatixon, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifdef __BORLANDC__
#pragma hdrstop
#endif
wxString wxGridTableBase::GetRowLabelValue( int row )
{
wxString s;
wxString wxGridTableBase::GetRowLabelValue( int row )
{
wxString s;
// RD: Starting the rows at zero confuses users,
// no matter how much it makes sense to us geeks.
s << row + 1;
// RD: Starting the rows at zero confuses users,
// no matter how much it makes sense to us geeks.
s << row + 1;
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-// Name: generic/gridsel.cpp
+// Name: src/generic/gridsel.cpp
// Purpose: wxGridSelection
// Author: Stefan Neis
// Modified by:
// Purpose: wxGridSelection
// Author: Stefan Neis
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
// ============================================================================
// declarations
// ============================================================================
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
// 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"
#if wxUSE_GRID
#include "wx/generic/gridsel.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: generic/imaglist.cpp
+// Name: src/generic/imaglist.cpp
// Purpose:
// Author: Robert Roebling
// Id: $id$
// Purpose:
// Author: Robert Roebling
// Id: $id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
m_width = bitmap.GetWidth();
m_height = bitmap.GetHeight();
}
m_width = bitmap.GetWidth();
m_height = bitmap.GetHeight();
}
return m_images.GetCount()-1;
}
return m_images.GetCount()-1;
}
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/generic/printps.cpp
// Purpose: Postscript print/preview framework
// Author: Julian Smart
// Modified by:
// Purpose: Postscript print/preview framework
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_BOOKCTRL
#ifndef WX_PRECOMP
#if wxUSE_BOOKCTRL
#ifndef WX_PRECOMP
#endif
wxBookCtrlBase* bookCtrl = NULL;
#endif
wxBookCtrlBase* bookCtrl = NULL;
#if wxUSE_NOTEBOOK
if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
#if wxUSE_NOTEBOOK
if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
#endif
if (!bookCtrl)
bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
#endif
if (!bookCtrl)
bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
bookCtrl->SetFitToCurrentPage(true);
if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
bookCtrl->SetFitToCurrentPage(true);
void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
{
event.Skip();
void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
{
event.Skip();
if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
{
int sel = GetBookCtrl()->GetSelection();
if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
{
int sel = GetBookCtrl()->GetSelection();
}
#endif // wxUSE_BOOKCTRL
}
#endif // wxUSE_BOOKCTRL
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+#endif
#include "wx/bitmap.h"
#include "wx/palette.h"
#include "wx/bitmap.h"
#include "wx/palette.h"
#include "wx/filefn.h"
#include "wx/image.h"
#include "wx/dcmemory.h"
#include "wx/filefn.h"
#include "wx/image.h"
#include "wx/dcmemory.h"
#include "wx/rawbmp.h"
// need this to get gdk_image_new_bitmap()
#include "wx/rawbmp.h"
// need this to get gdk_image_new_bitmap()
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/bmpbuttn.cpp
+// Name: src/gtk/bmpbuttn.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
#if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk/button.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_BUTTON
#include "wx/button.h"
#if wxUSE_BUTTON
#include "wx/button.h"
const wxPoint &pos, const wxSize &size,
long style, const wxValidator& validator, const wxString &name )
{
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") );
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxButton creation failed") );
}
m_widget = gtk_button_new_with_mnemonic("");
}
m_widget = gtk_button_new_with_mnemonic("");
bool wxButton::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
bool wxButton::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
}
bool wxButton::IsOwnGtkWindow( GdkWindow *window )
}
bool wxButton::IsOwnGtkWindow( GdkWindow *window )
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk/checkbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_CHECKBOX
#include "wx/checkbox.h"
#if wxUSE_CHECKBOX
#include "wx/checkbox.h"
const wxValidator& validator,
const wxString &name )
{
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") );
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxCheckBox creation failed") );
}
wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
}
wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
}
void wxCheckBox::SetValue( bool state )
}
void wxCheckBox::SetValue( bool state )
if (state == GetValue())
return;
if (state == GetValue())
return;
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
}
bool wxCheckBox::GetValue() const
{
}
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));
}
return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox));
}
bool wxCheckBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
bool wxCheckBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
gtk_widget_set_sensitive( m_widgetLabel, enable );
gtk_widget_set_sensitive( m_widgetLabel, enable );
}
void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
}
void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk/data.cpp
// Purpose: Various global GTK-specific data
// Author: Robert Roebling
// Id: $Id$
// Purpose: Various global GTK-specific data
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/dc.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/dc.h"
wxCursor g_globalCursor;
/* Don't allow event propagation during drag */
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 */
/* 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;
/* 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;
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk/dataview.cpp
// Purpose: wxDataViewCtrl GTK+2 implementation
// Author: Robert Roebling
// Id: $Id$
// Purpose: wxDataViewCtrl GTK+2 implementation
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_DATAVIEWCTRL
#include "wx/dataview.h"
#if wxUSE_DATAVIEWCTRL
#include "wx/dataview.h"
struct _GtkWxListStoreClass
{
GObjectClass list_parent_class;
struct _GtkWxListStoreClass
{
GObjectClass list_parent_class;
};
static GtkWxListStore *wxgtk_list_store_new (void);
};
static GtkWxListStore *wxgtk_list_store_new (void);
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,
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,
static gboolean wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
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,
static GtkTreePath *wxgtk_list_store_get_path (GtkTreeModel *tree_model,
static void wxgtk_list_store_get_value (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);
static gboolean wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
static gboolean wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
static gboolean wxgtk_list_store_iter_children (GtkTreeModel *tree_model,
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,
static gboolean wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
static gint wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
static gint wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
static gboolean wxgtk_list_store_iter_nth_child (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);
static gboolean wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
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 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;
- 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 =
{
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_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,
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;
}
return list_store_type;
/* must chain up */
(* list_parent_class->finalize) (object);
}
/* must chain up */
(* list_parent_class->finalize) (object);
}
} // extern "C"
//-----------------------------------------------------------------------------
} // extern "C"
//-----------------------------------------------------------------------------
static GType
wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
static GType
wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
{
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID);
GType gtype = G_TYPE_INVALID;
{
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), G_TYPE_INVALID);
GType gtype = G_TYPE_INVALID;
wxString wxtype = list_store->model->GetColType( (size_t) index );
wxString wxtype = list_store->model->GetColType( (size_t) index );
if (wxtype == wxT("string"))
gtype = G_TYPE_STRING;
if (wxtype == wxT("string"))
gtype = G_TYPE_STRING;
static gboolean
wxgtk_list_store_get_iter (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);
{
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
static GtkTreePath *
wxgtk_list_store_get_path (GtkTreeModel *tree_model,
static GtkTreePath *
wxgtk_list_store_get_path (GtkTreeModel *tree_model,
{
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);
{
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);
GtkTreePath *retval = gtk_tree_path_new ();
// user_data is just the index
int i = (wxUIntPtr) iter->user_data;
GtkTreePath *retval = gtk_tree_path_new ();
// user_data is just the index
int i = (wxUIntPtr) iter->user_data;
static void
wxgtk_list_store_get_value (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) );
{
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
#if 0
GtkTreeDataList *list;
gint tmp_column = column;
#if 0
GtkTreeDataList *list;
gint tmp_column = column;
g_value_init (value, GTK_LIST_STORE (tree_model)->column_headers[column]);
else
_gtk_tree_data_list_node_to_value (list,
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,
#endif
}
static gboolean
wxgtk_list_store_iter_next (GtkTreeModel *tree_model,
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
int n = (wxUIntPtr) iter->user_data;
g_return_val_if_fail (list_store->stamp == iter->stamp, FALSE);
int n = (wxUIntPtr) iter->user_data;
if (n == -1)
return FALSE;
if (n == -1)
return FALSE;
if (n >= (int) list_store->model->GetNumberOfRows()-1)
return FALSE;
if (n >= (int) list_store->model->GetNumberOfRows()-1)
return FALSE;
iter->user_data = (gpointer) ++n;
return TRUE;
iter->user_data = (gpointer) ++n;
return TRUE;
static gboolean
wxgtk_list_store_iter_children (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;
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
// this is a list, nodes have no children
if (parent)
return FALSE;
iter->stamp = list_store->stamp;
iter->user_data = (gpointer) -1;
// this is a list, nodes have no children
if (parent)
return FALSE;
iter->stamp = list_store->stamp;
iter->user_data = (gpointer) -1;
return TRUE;
}
static gboolean
wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
return TRUE;
}
static gboolean
wxgtk_list_store_iter_has_child (GtkTreeModel *tree_model,
{
return FALSE;
}
static gint
wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
{
return FALSE;
}
static gint
wxgtk_list_store_iter_n_children (GtkTreeModel *tree_model,
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), -1);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
if (iter == NULL)
return (gint) list_store->model->GetNumberOfRows();
g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
if (iter == NULL)
return (gint) list_store->model->GetNumberOfRows();
g_return_val_if_fail (list_store->stamp == iter->stamp, -1);
return 0;
}
static gboolean
wxgtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
return 0;
}
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;
{
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
GtkWxListStore *list_store = (GtkWxListStore *) tree_model;
if (parent)
return FALSE;
if (n < 0)
return FALSE;
if (parent)
return FALSE;
if (n < 0)
return FALSE;
if (n >= (gint) list_store->model->GetNumberOfRows())
return FALSE;
iter->stamp = list_store->stamp;
iter->user_data = (gpointer) n;
if (n >= (gint) list_store->model->GetNumberOfRows())
return FALSE;
iter->stamp = list_store->stamp;
iter->user_data = (gpointer) n;
return TRUE;
}
static gboolean
wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
return TRUE;
}
static gboolean
wxgtk_list_store_iter_parent (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *child)
+ GtkTreeIter *iter,
+ GtkTreeIter *child)
GObject *object );
static void gtk_wx_cell_renderer_get_size (
GtkCellRenderer *cell,
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,
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,
static gboolean gtk_wx_cell_renderer_activate(
GtkCellRenderer *cell,
GdkEvent *event,
gtk_wx_cell_renderer_get_type (void)
{
static GType cell_wx_type = 0;
gtk_wx_cell_renderer_get_type (void)
{
static GType cell_wx_type = 0;
static const GTypeInfo cell_wx_info =
{
sizeof (GtkWxCellRendererClass),
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,
(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,
};
sizeof (GtkWxCellRenderer),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_wx_cell_renderer_init,
};
- cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER,
+ cell_wx_type = g_type_register_static( GTK_TYPE_CELL_RENDERER,
"GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 );
}
"GtkWxCellRenderer", &cell_wx_info, (GTypeFlags)0 );
}
static void
gtk_wx_cell_renderer_get_size (GtkCellRenderer *renderer,
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;
{
GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
wxDataViewCustomCell *cell = wxrenderer->cell;
wxSize size = cell->GetSize();
gint calc_width = (gint) renderer->xpad * 2 + size.x;
gint calc_height = (gint) renderer->ypad * 2 + size.y;
wxSize size = cell->GetSize();
gint calc_width = (gint) renderer->xpad * 2 + size.x;
gint calc_height = (gint) renderer->ypad * 2 + size.y;
*y_offset = 0;
if (cell_area && size.x > 0 && size.y > 0)
{
if (x_offset)
*y_offset = 0;
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;
*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 *
if (y_offset)
{
*y_offset = (gint)((renderer->yalign *
if (width)
*width = calc_width;
if (width)
*width = calc_width;
if (height)
*height = calc_height;
}
static void
gtk_wx_cell_renderer_render (GtkCellRenderer *renderer,
if (height)
*height = calc_height;
}
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;
wxDataViewCustomCell *cell = wxrenderer->cell;
{
GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
wxDataViewCustomCell *cell = wxrenderer->cell;
GdkRectangle rect;
gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
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;
rect.width -= renderer->xpad * 2;
rect.height -= renderer->ypad * 2;
rect.x += cell_area->x;
rect.y += cell_area->y;
rect.width -= renderer->xpad * 2;
rect.height -= renderer->ypad * 2;
GdkRectangle dummy;
if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
{
GdkRectangle dummy;
if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
{
dc->m_window = window;
dc->SetUpDC();
}
dc->m_window = window;
dc->SetUpDC();
}
int state = 0;
if (flags & GTK_CELL_RENDERER_SELECTED)
state |= wxDATAVIEW_CELL_SELECTED;
int state = 0;
if (flags & GTK_CELL_RENDERER_SELECTED)
state |= wxDATAVIEW_CELL_SELECTED;
if (flags & GTK_CELL_RENDERER_FOCUSED)
state |= wxDATAVIEW_CELL_FOCUSED;
cell->Render( renderrect, dc, state );
if (flags & GTK_CELL_RENDERER_FOCUSED)
state |= wxDATAVIEW_CELL_FOCUSED;
cell->Render( renderrect, dc, state );
gtk_wx_cell_renderer_activate(
GtkCellRenderer *renderer,
GdkEvent *event,
gtk_wx_cell_renderer_activate(
GtkCellRenderer *renderer,
GdkEvent *event,
{
GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
wxDataViewCustomCell *cell = wxrenderer->cell;
{
GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
wxDataViewCustomCell *cell = wxrenderer->cell;
GdkRectangle rect;
gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
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;
rect.width -= renderer->xpad * 2;
rect.height -= renderer->ypad * 2;
rect.x += cell_area->x;
rect.y += cell_area->y;
rect.width -= renderer->xpad * 2;
rect.height -= renderer->ypad * 2;
wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
size_t model_row = (size_t)gtk_tree_path_get_indices (treepath)[0];
gtk_tree_path_free( treepath );
GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
size_t model_row = (size_t)gtk_tree_path_get_indices (treepath)[0];
gtk_tree_path_free( treepath );
size_t model_col = cell->GetOwner()->GetModelColumn();
size_t model_col = cell->GetOwner()->GetModelColumn();
if (event->type == GDK_BUTTON_PRESS)
{
GdkEventButton *button_event = (GdkEventButton*) event;
if (event->type == GDK_BUTTON_PRESS)
{
GdkEventButton *button_event = (GdkEventButton*) event;
- wxPoint pt( ((int) button_event->x) - renderrect.x,
+ wxPoint pt( ((int) button_event->x) - renderrect.x,
((int) button_event->y) - renderrect.y );
((int) button_event->y) - renderrect.y );
bool ret = false;
if (button_event->button == 1)
{
bool ret = false;
if (button_event->button == 1)
{
if (cell->RightClick( pt, renderrect, model, model_col, model_row ))
ret = true;
}
if (cell->RightClick( pt, renderrect, model, model_col, model_row ))
ret = true;
}
wxrenderer->last_click = button_event->time;
wxrenderer->last_click = button_event->time;
-// ---------------------------------------------------------
+// ---------------------------------------------------------
// wxGtkDataViewListModelNotifier
// wxGtkDataViewListModelNotifier
-// ---------------------------------------------------------
+// ---------------------------------------------------------
class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier
{
public:
wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model );
class wxGtkDataViewListModelNotifier: public wxDataViewListModelNotifier
{
public:
wxGtkDataViewListModelNotifier( GtkWxListStore* gtk_store, wxDataViewListModel *wx_model );
virtual bool RowAppended();
virtual bool RowPrepended();
virtual bool RowInserted( size_t before );
virtual bool RowAppended();
virtual bool RowPrepended();
virtual bool RowInserted( size_t before );
virtual bool ValueChanged( size_t col, size_t row );
virtual bool RowsReordered( size_t *new_order );
virtual bool Cleared();
virtual bool ValueChanged( size_t col, size_t row );
virtual bool RowsReordered( size_t *new_order );
virtual bool Cleared();
GtkWxListStore *m_gtk_store;
wxDataViewListModel *m_wx_model;
};
GtkWxListStore *m_gtk_store;
wxDataViewListModel *m_wx_model;
};
-// ---------------------------------------------------------
+// ---------------------------------------------------------
// wxGtkDataViewListModelNotifier
// wxGtkDataViewListModelNotifier
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier(
+wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier(
GtkWxListStore* gtk_store, wxDataViewListModel *wx_model )
{
m_gtk_store = gtk_store;
m_wx_model = wx_model;
}
GtkWxListStore* gtk_store, wxDataViewListModel *wx_model )
{
m_gtk_store = gtk_store;
m_wx_model = wx_model;
}
bool wxGtkDataViewListModelNotifier::RowAppended()
{
size_t pos = m_wx_model->GetNumberOfRows()-1;
bool wxGtkDataViewListModelNotifier::RowAppended()
{
size_t pos = m_wx_model->GetNumberOfRows()-1;
GtkTreeIter iter;
iter.stamp = m_gtk_store->stamp;
iter.user_data = (gpointer) pos;
GtkTreeIter iter;
iter.stamp = m_gtk_store->stamp;
iter.user_data = (gpointer) pos;
GtkTreePath *path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, (gint) pos);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
gtk_tree_path_free (path);
GtkTreePath *path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, (gint) pos);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
gtk_tree_path_free (path);
GtkTreeIter iter;
iter.stamp = m_gtk_store->stamp;
iter.user_data = (gpointer) 0;
GtkTreeIter iter;
iter.stamp = m_gtk_store->stamp;
iter.user_data = (gpointer) 0;
GtkTreePath *path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, (gint) 0);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
gtk_tree_path_free (path);
GtkTreePath *path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, (gint) 0);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (m_gtk_store), path, &iter);
gtk_tree_path_free (path);
gtk_tree_path_append_index( path, model_row );
GdkRectangle cell_area;
gtk_tree_view_get_cell_area( widget, path, column, &cell_area );
gtk_tree_path_append_index( path, model_row );
GdkRectangle cell_area;
gtk_tree_view_get_cell_area( widget, path, column, &cell_area );
- gtk_tree_path_free( path );
+ gtk_tree_path_free( path );
int ydiff = column->button->allocation.height;
// Redraw
int ydiff = column->button->allocation.height;
// Redraw
- gtk_widget_queue_draw_area( GTK_WIDGET(widget),
+ gtk_widget_queue_draw_area( GTK_WIDGET(widget),
cell_area.x, ydiff + cell_area.y, cell_area.width, cell_area.height );
}
node = node->GetNext();
}
cell_area.x, ydiff + cell_area.y, cell_area.width, cell_area.height );
}
node = node->GetNext();
}
wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
// Doesn't work yet...
wxDataViewViewingColumn* viewing_column = (wxDataViewViewingColumn*) node->GetData();
GtkTreeView *widget = GTK_TREE_VIEW(viewing_column->m_viewColumn->GetOwner()->m_treeview);
// Doesn't work yet...
- gtk_widget_queue_draw( GTK_WIDGET(widget) );
+ gtk_widget_queue_draw( GTK_WIDGET(widget) );
node = node->GetNext();
}
node = node->GetNext();
}
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase)
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCell, wxDataViewCellBase)
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
gchar *arg1, gchar *arg2, gpointer user_data );
}
gchar *arg1, gchar *arg2, gpointer user_data );
}
-static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
+static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
gchar *arg1, gchar *arg2, gpointer user_data )
{
wxDataViewTextCell *cell = (wxDataViewTextCell*) user_data;
gchar *arg1, gchar *arg2, gpointer user_data )
{
wxDataViewTextCell *cell = (wxDataViewTextCell*) user_data;
wxString tmp = wxGTK_CONV_BACK( arg2 );
wxVariant value = tmp;
if (!cell->Validate( value ))
return;
wxString tmp = wxGTK_CONV_BACK( arg2 );
wxVariant value = tmp;
if (!cell->Validate( value ))
return;
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
size_t model_row = (size_t)gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free( path );
GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
size_t model_row = (size_t)gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free( path );
size_t model_col = cell->GetOwner()->GetModelColumn();
size_t model_col = cell->GetOwner()->GetModelColumn();
model->SetValue( value, model_col, model_row );
model->ValueChanged( model_col, model_row );
}
model->SetValue( value, model_col, model_row );
model->ValueChanged( model_col, model_row );
}
wxDataViewCell( varianttype, mode )
{
m_renderer = (void*) gtk_cell_renderer_text_new();
wxDataViewCell( varianttype, mode )
{
m_renderer = (void*) gtk_cell_renderer_text_new();
if (m_mode & wxDATAVIEW_CELL_EDITABLE)
{
GValue gvalue = { 0, };
if (m_mode & wxDATAVIEW_CELL_EDITABLE)
{
GValue gvalue = { 0, };
g_value_set_boolean( &gvalue, true );
g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
g_value_unset( &gvalue );
g_value_set_boolean( &gvalue, true );
g_object_set_property( G_OBJECT(m_renderer), "editable", &gvalue );
g_value_unset( &gvalue );
g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
}
}
g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
}
}
bool wxDataViewTextCell::SetValue( const wxVariant &value )
{
wxString tmp = value;
bool wxDataViewTextCell::SetValue( const wxVariant &value )
{
wxString tmp = value;
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_string( &gvalue, wxGTK_CONV( tmp ) );
g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
g_value_unset( &gvalue );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_string( &gvalue, wxGTK_CONV( tmp ) );
g_object_set_property( G_OBJECT(m_renderer), "text", &gvalue );
g_value_unset( &gvalue );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_object_get_property( G_OBJECT(m_renderer), "text", &gvalue );
- wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) );
+ wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &gvalue ) );
g_value_unset( &gvalue );
g_value_unset( &gvalue );
value = tmp;
return true;
}
value = tmp;
return true;
}
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
+static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
gchar *path, gpointer user_data );
}
gchar *path, gpointer user_data );
}
-static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
+static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
gchar *path, gpointer user_data )
{
wxDataViewToggleCell *cell = (wxDataViewToggleCell*) user_data;
gchar *path, gpointer user_data )
{
wxDataViewToggleCell *cell = (wxDataViewToggleCell*) user_data;
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_object_get_property( G_OBJECT(renderer), "active", &gvalue );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_object_get_property( G_OBJECT(renderer), "active", &gvalue );
- bool tmp = g_value_get_boolean( &gvalue );
+ bool tmp = g_value_get_boolean( &gvalue );
g_value_unset( &gvalue );
// invert it
tmp = !tmp;
g_value_unset( &gvalue );
// invert it
tmp = !tmp;
wxVariant value = tmp;
if (!cell->Validate( value ))
return;
wxVariant value = tmp;
if (!cell->Validate( value ))
return;
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
size_t model_row = (size_t)gtk_tree_path_get_indices (gtk_path)[0];
gtk_tree_path_free( gtk_path );
GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
size_t model_row = (size_t)gtk_tree_path_get_indices (gtk_path)[0];
gtk_tree_path_free( gtk_path );
size_t model_col = cell->GetOwner()->GetModelColumn();
size_t model_col = cell->GetOwner()->GetModelColumn();
model->SetValue( value, model_col, model_row );
model->ValueChanged( model_col, model_row );
}
IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell)
model->SetValue( value, model_col, model_row );
model->ValueChanged( model_col, model_row );
}
IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleCell, wxDataViewCell)
-wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype,
+wxDataViewToggleCell::wxDataViewToggleCell( const wxString &varianttype,
wxDataViewCellMode mode ) :
wxDataViewCell( varianttype, mode )
{
m_renderer = (void*) gtk_cell_renderer_toggle_new();
wxDataViewCellMode mode ) :
wxDataViewCell( varianttype, mode )
{
m_renderer = (void*) gtk_cell_renderer_toggle_new();
if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
{
g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
{
g_signal_connect_after( m_renderer, "toggled", G_CALLBACK(wxGtkToggleRendererToggledCallback), this );
bool wxDataViewToggleCell::SetValue( const wxVariant &value )
{
bool tmp = value;
bool wxDataViewToggleCell::SetValue( const wxVariant &value )
{
bool tmp = value;
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_value_set_boolean( &gvalue, tmp );
g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue );
g_value_unset( &gvalue );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_value_set_boolean( &gvalue, tmp );
g_object_set_property( G_OBJECT(m_renderer), "active", &gvalue );
g_value_unset( &gvalue );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_BOOLEAN );
g_object_get_property( G_OBJECT(m_renderer), "active", &gvalue );
- bool tmp = g_value_get_boolean( &gvalue );
+ bool tmp = g_value_get_boolean( &gvalue );
g_value_unset( &gvalue );
g_value_unset( &gvalue );
value = tmp;
return true;
}
value = tmp;
return true;
}
-
-// ---------------------------------------------------------
+
+// ---------------------------------------------------------
-// ---------------------------------------------------------
+// ---------------------------------------------------------
class wxDataViewCtrlDC: public wxWindowDC
{
class wxDataViewCtrlDC: public wxWindowDC
{
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell)
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomCell, wxDataViewCell)
-wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype,
+wxDataViewCustomCell::wxDataViewCustomCell( const wxString &varianttype,
wxDataViewCellMode mode, bool no_init ) :
wxDataViewCell( varianttype, mode )
{
m_dc = NULL;
wxDataViewCellMode mode, bool no_init ) :
wxDataViewCell( varianttype, mode )
{
m_dc = NULL;
if (no_init)
m_renderer = NULL;
else
if (no_init)
m_renderer = NULL;
else
{
GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
renderer->cell = this;
{
GtkWxCellRenderer *renderer = (GtkWxCellRenderer *) gtk_wx_cell_renderer_new();
renderer->cell = this;
m_renderer = (void*) renderer;
m_renderer = (void*) renderer;
if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
{
GValue gvalue = { 0, };
if (m_mode & wxDATAVIEW_CELL_ACTIVATABLE)
{
GValue gvalue = { 0, };
g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
g_value_unset( &gvalue );
}
g_object_set_property( G_OBJECT(m_renderer), "mode", &gvalue );
g_value_unset( &gvalue );
}
return NULL;
m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
}
return NULL;
m_dc = new wxDataViewCtrlDC( GetOwner()->GetOwner() );
}
-
-// ---------------------------------------------------------
+
+// ---------------------------------------------------------
// wxDataViewProgressCell
// wxDataViewProgressCell
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell)
IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressCell, wxDataViewCustomCell)
-wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label,
+wxDataViewProgressCell::wxDataViewProgressCell( const wxString &label,
const wxString &varianttype, wxDataViewCellMode mode ) :
const wxString &varianttype, wxDataViewCellMode mode ) :
- wxDataViewCustomCell( varianttype, mode, true )
+ wxDataViewCustomCell( varianttype, mode, true )
{
m_label = label;
m_value = 0;
{
m_label = label;
m_value = 0;
#ifdef __WXGTK26__
if (!gtk_check_version(2,6,0))
{
m_renderer = (void*) gtk_cell_renderer_progress_new();
#ifdef __WXGTK26__
if (!gtk_check_version(2,6,0))
{
m_renderer = (void*) gtk_cell_renderer_progress_new();
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) );
GValue gvalue = { 0, };
g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_boolean( &gvalue, wxGTK_CONV(m_label) );
#endif
{
m_value = (long) value;
#endif
{
m_value = (long) value;
if (m_value < 0) m_value = 0;
if (m_value > 100) m_value = 100;
}
if (m_value < 0) m_value = 0;
if (m_value > 100) m_value = 100;
}
bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
{
double pct = (double)m_value / 100.0;
bool wxDataViewProgressCell::Render( wxRect cell, wxDC *dc, int state )
{
double pct = (double)m_value / 100.0;
dc->SetBrush( *wxTRANSPARENT_BRUSH );
dc->SetPen( *wxBLACK_PEN );
dc->DrawRectangle( cell );
dc->SetBrush( *wxTRANSPARENT_BRUSH );
dc->SetPen( *wxBLACK_PEN );
dc->DrawRectangle( cell );
{
return wxSize(40,12);
}
{
return wxSize(40,12);
}
-
-// ---------------------------------------------------------
+
+// ---------------------------------------------------------
-// ---------------------------------------------------------
+// ---------------------------------------------------------
class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow
{
class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow
{
wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value,
wxDataViewListModel *model, size_t col, size_t row ) :
wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value,
wxDataViewListModel *model, size_t col, size_t row ) :
wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
SetSizer( sizer );
sizer->Fit( this );
}
SetSizer( sizer );
sizer->Fit( this );
}
virtual void OnDismiss()
{
}
virtual void OnDismiss()
{
}
void OnCalendar( wxCalendarEvent &event );
void OnCalendar( wxCalendarEvent &event );
- wxDataViewListModel *m_model;
+ wxDataViewListModel *m_model;
size_t m_col;
size_t m_row;
size_t m_col;
size_t m_row;
private:
DECLARE_EVENT_TABLE()
};
private:
DECLARE_EVENT_TABLE()
};
wxDataViewCustomCell( varianttype, mode )
{
}
wxDataViewCustomCell( varianttype, mode )
{
}
bool wxDataViewDateCell::SetValue( const wxVariant &value )
{
m_date = value.GetDateTime();
bool wxDataViewDateCell::SetValue( const wxVariant &value )
{
m_date = value.GetDateTime();
model->GetValue( variant, col, row );
wxDateTime value = variant.GetDateTime();
model->GetValue( variant, col, row );
wxDateTime value = variant.GetDateTime();
- wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient(
+ wxDataViewDateCellPopupTransient *popup = new wxDataViewDateCellPopupTransient(
GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
wxPoint pos = wxGetMousePosition();
popup->Move( pos );
GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
wxPoint pos = wxGetMousePosition();
popup->Move( pos );
-// ---------------------------------------------------------
+// ---------------------------------------------------------
-// ---------------------------------------------------------
+// ---------------------------------------------------------
extern "C" {
static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
extern "C" {
static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
{
g_return_if_fail (GTK_IS_WX_LIST_STORE (model));
GtkWxListStore *list_store = (GtkWxListStore *) model;
{
g_return_if_fail (GTK_IS_WX_LIST_STORE (model));
GtkWxListStore *list_store = (GtkWxListStore *) model;
wxDataViewCell *cell = (wxDataViewCell*) data;
size_t model_row = (size_t) iter->user_data;
wxDataViewCell *cell = (wxDataViewCell*) data;
size_t model_row = (size_t) iter->user_data;
wxVariant value;
list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
if (value.GetType() != cell->GetVariantType())
wxLogError( wxT("Wrong type\n") );
wxVariant value;
list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
if (value.GetType() != cell->GetVariantType())
wxLogError( wxT("Wrong type\n") );
cell->SetValue( value );
}
IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
cell->SetValue( value );
}
IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
size_t model_column, int flags ) :
wxDataViewColumnBase( title, cell, model_column, flags )
{
GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
size_t model_column, int flags ) :
wxDataViewColumnBase( title, cell, model_column, flags )
{
GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
GtkTreeViewColumn *column = gtk_tree_view_column_new();
GtkTreeViewColumn *column = gtk_tree_view_column_new();
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
gtk_tree_view_column_pack_start( column, renderer, TRUE );
gtk_tree_view_column_pack_start( column, renderer, TRUE );
-
- gtk_tree_view_column_set_cell_data_func( column, renderer,
+
+ gtk_tree_view_column_set_cell_data_func( column, renderer,
wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
m_column = (void*) column;
}
m_column = (void*) column;
}
void wxDataViewColumn::SetTitle( const wxString &title )
{
wxDataViewColumnBase::SetTitle( title );
void wxDataViewColumn::SetTitle( const wxString &title )
{
wxDataViewColumnBase::SetTitle( title );
GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
}
GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
}
}
bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
}
bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size,
+ const wxPoint& pos, const wxSize& size,
long style, const wxValidator& validator )
{
Init();
long style, const wxValidator& validator )
{
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") );
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator ))
{
wxFAIL_MSG( wxT("wxDataViewCtrl creation failed") );
}
m_widget = gtk_scrolled_window_new (NULL, NULL);
}
m_widget = gtk_scrolled_window_new (NULL, NULL);
m_treeview = gtk_tree_view_new();
gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
m_treeview = gtk_tree_view_new();
gtk_container_add (GTK_CONTAINER (m_widget), m_treeview);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_show (m_treeview);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_show (m_treeview);
m_parent->DoAddChild( this );
PostCreation(size);
m_parent->DoAddChild( this );
PostCreation(size);
m_notifier = new wxGtkDataViewListModelNotifier( gtk_store, model );
m_notifier = new wxGtkDataViewListModelNotifier( gtk_store, model );
- model->AddNotifier( m_notifier );
+ model->AddNotifier( m_notifier );
gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) );
g_object_unref( gtk_store );
gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), GTK_TREE_MODEL(gtk_store) );
g_object_unref( gtk_store );
{
if (!wxDataViewCtrlBase::AppendColumn(col))
return false;
{
if (!wxDataViewCtrlBase::AppendColumn(col))
return false;
GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
GtkTreeViewColumn *column = (GtkTreeViewColumn *)col->GetGtkHandle();
gtk_tree_view_append_column( GTK_TREE_VIEW(m_treeview), column );
// !wxUSE_GENERICDATAVIEWCTRL
// !wxUSE_GENERICDATAVIEWCTRL
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/fontdlg.cpp
+// Name: src/gtk/fontdlg.cpp
// Purpose: wxFontDialog
// Author: Robert Roebling
// Id: $Id$
// Purpose: wxFontDialog
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_FONTDLG
#ifndef __WXGPE__
#if wxUSE_FONTDLG
#ifndef __WXGPE__
bool wxFontDialog::DoCreate(wxWindow *parent)
{
bool wxFontDialog::DoCreate(wxWindow *parent)
{
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
wxDefaultValidator, wxT("fontdialog") ))
{
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
wxDefaultValidator, wxT("fontdialog") ))
{
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
}
wxString m_message( _("Choose font") );
}
wxString m_message( _("Choose font") );
}
wxFontDialog::~wxFontDialog()
}
wxFontDialog::~wxFontDialog()
#endif // wxUSE_FONTDLG
#endif // GPE
#endif // wxUSE_FONTDLG
#endif // GPE
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk/frame.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
// ============================================================================
// declarations
// ============================================================================
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
// 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"
#include "wx/frame.h"
#include "wx/dialog.h"
#include "wx/control.h"
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
// ============================================================================
// declarations
// ============================================================================
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
#ifdef __VMS
#define XIconifyWindow XICONIFYWINDOW
#endif
#ifdef __VMS
#define XIconifyWindow XICONIFYWINDOW
#endif
#include "wx/toplevel.h"
#include "wx/log.h"
#include "wx/dialog.h"
#include "wx/toplevel.h"
#include "wx/log.h"
#include "wx/dialog.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/bmpbuttn.cpp
+// Name: src/gtk1/bmpbuttn.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
#if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h"
}
#endif // wxUSE_BMPBUTTON
}
#endif // wxUSE_BMPBUTTON
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk1/button.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_BUTTON
#include "wx/button.h"
#if wxUSE_BUTTON
#include "wx/button.h"
const wxPoint &pos, const wxSize &size,
long style, const wxValidator& validator, const wxString &name )
{
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") );
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxButton creation failed") );
}
m_widget = gtk_button_new_with_label("");
}
m_widget = gtk_button_new_with_label("");
bool wxButton::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
bool wxButton::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
}
bool wxButton::IsOwnGtkWindow( GdkWindow *window )
}
bool wxButton::IsOwnGtkWindow( GdkWindow *window )
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk1/checkbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_CHECKBOX
#include "wx/checkbox.h"
#if wxUSE_CHECKBOX
#include "wx/checkbox.h"
const wxValidator& validator,
const wxString &name )
{
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") );
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxCheckBox creation failed") );
}
wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
}
wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 ||
}
void wxCheckBox::SetValue( bool state )
}
void wxCheckBox::SetValue( bool state )
if (state == GetValue())
return;
if (state == GetValue())
return;
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
}
bool wxCheckBox::GetValue() const
{
}
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;
}
return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active;
}
bool wxCheckBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
bool wxCheckBox::Enable( bool enable )
{
if ( !wxControl::Enable( enable ) )
gtk_widget_set_sensitive( m_widgetLabel, enable );
gtk_widget_set_sensitive( m_widgetLabel, enable );
}
void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
}
void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk1/data.cpp
// Purpose: Various global GTK-specific data
// Author: Robert Roebling
// Id: $Id$
// Purpose: Various global GTK-specific data
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/dc.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/dc.h"
wxCursor g_globalCursor;
/* Don't allow event propagation during drag */
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 */
/* 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;
/* 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;
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/fontdlg.cpp
+// Name: src/gtk1/fontdlg.cpp
// Purpose: wxFontDialog
// Author: Robert Roebling
// Id: $Id$
// Purpose: wxFontDialog
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_FONTDLG
#ifndef __WXGPE__
#if wxUSE_FONTDLG
#ifndef __WXGPE__
bool wxFontDialog::DoCreate(wxWindow *parent)
{
bool wxFontDialog::DoCreate(wxWindow *parent)
{
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
wxDefaultValidator, wxT("fontdialog") ))
{
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
wxDefaultValidator, wxT("fontdialog") ))
{
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
}
wxString m_message( _("Choose font") );
}
wxString m_message( _("Choose font") );
}
wxFontDialog::~wxFontDialog()
}
wxFontDialog::~wxFontDialog()
#endif // wxUSE_FONTDLG
#endif // GPE
#endif // wxUSE_FONTDLG
#endif // GPE
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/gtk1/frame.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
// ============================================================================
// declarations
// ============================================================================
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
// 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"
#include "wx/frame.h"
#include "wx/dialog.h"
#include "wx/control.h"
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
// ============================================================================
// declarations
// ============================================================================
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
#ifdef __VMS
#define XIconifyWindow XICONIFYWINDOW
#endif
#ifdef __VMS
#define XIconifyWindow XICONIFYWINDOW
#endif
#include "wx/toplevel.h"
#include "wx/log.h"
#include "wx/dialog.h"
#include "wx/toplevel.h"
#include "wx/log.h"
#include "wx/dialog.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/helpdata.cpp
// Purpose: wxHtmlHelpData
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik
// Purpose: wxHtmlHelpData
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
#if wxUSE_HTML && wxUSE_STREAMS
#ifndef WXPRECOMP
HP_TagHandler *handler = new HP_TagHandler(book);
parser.AddTagHandler(handler);
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) );
wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
}
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) );
handler->Reset(m_index);
parser.Parse(buf);
}
handler->Reset(m_index);
parser.Parse(buf);
}
- else if (!indexfile.IsEmpty())
+ else if (!indexfile.empty())
{
wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
}
{
wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
}
if (wxIsAbsolutePath(path)) m_tempPath = path;
else m_tempPath = wxGetCwd() + _T("/") + 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('/');
}
}
m_tempPath << _T('/');
}
}
int IndexOld = m_index.size(),
ContentsOld = m_contents.size();
int IndexOld = m_index.size(),
ContentsOld = m_contents.size();
fsys.ChangePathTo(path, true);
size_t booksCnt = m_bookRecords.GetCount();
fsys.ChangePathTo(path, true);
size_t booksCnt = m_bookRecords.GetCount();
#endif
s = fsys.FindFirst(book + wxT("#zip:*.hhp"), wxFILE);
#endif
s = fsys.FindFirst(book + wxT("#zip:*.hhp"), wxFILE);
{
if (AddBook(s)) rt = true;
s = fsys.FindNext();
{
if (AddBook(s)) rt = true;
s = fsys.FindNext();
wxASSERT_MSG(!m_Keyword.empty(), wxT("wxHtmlSearchEngine::LookFor must be called before scanning!"));
int i, j;
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);
bool found = false;
wxHtmlFilterHTML filter;
wxString tmp = filter.ReadFile(file);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/htmlcell.cpp
// Purpose: wxHtmlCell - basic element of HTML output
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtmlCell - basic element of HTML output
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/colour.h"
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/colour.h"
int wdi;
wxString wd = tag.GetParam(wxT("WIDTH"));
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);
{
wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/htmlfilt.cpp
// Purpose: wxHtmlFilter - input filter for translating into HTML format
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtmlFilter - input filter for translating into HTML format
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/htmlpars.cpp
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"
{
wxHtmlTagsCache cache(m_Source);
m_TextPieces = new wxHtmlTextPieces;
{
wxHtmlTagsCache cache(m_Source);
m_TextPieces = new wxHtmlTextPieces;
- CreateDOMSubTree(NULL, 0, m_Source.Length(), &cache);
+ CreateDOMSubTree(NULL, 0, m_Source.length(), &cache);
{
m_CurTag = m_Tags;
m_CurTextPiece = 0;
{
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)
}
void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/htmltag.cpp
// Purpose: wxHtmlTag class (represents single tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtmlTag class (represents single tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML
-
wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
{
const wxChar *src = source.c_str();
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;
wxChar tagBuffer[256];
m_Cache = NULL;
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/htmlwin.cpp
// Purpose: wxHtmlWindow class for parsing & displaying HTML (implementation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtmlWindow class for parsing & displaying HTML (implementation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"
#ifndef WXPRECOMP
#include "wx/log.h"
#include "wx/intl.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/htmprint.cpp
// Purpose: html printing classes
// Author: Vaclav Slavik
// Created: 25/09/99
// Purpose: html printing classes
// Author: Vaclav Slavik
// Created: 25/09/99
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
+#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
+
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/dc.h"
#endif
#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"
#include "wx/dc.h"
#include "wx/print.h"
#include "wx/printdlg.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_dflist.cpp
// Purpose: wxHtml module for definition lists (DL,DT,DD)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for definition lists (DL,DT,DD)
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_fonts.cpp
// Purpose: wxHtml module for fonts & colors of fonts
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for fonts & colors of fonts
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_hline.cpp
// Purpose: wxHtml module for horizontal line (HR tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for horizontal line (HR tag)
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/pen.h"
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/pen.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_image.cpp
// Purpose: wxHtml module for displaying images
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for displaying images
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/dc.h"
#include "wx/scrolwin.h"
#ifndef WXPRECOMP
#include "wx/dc.h"
#include "wx/scrolwin.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_layout.cpp
// Purpose: wxHtml module for basic paragraphs/layout handling
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for basic paragraphs/layout handling
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-
-#if wxUSE_HTML && wxUSE_STREAMS
-
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#if wxUSE_HTML && wxUSE_STREAMS
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_links.cpp
// Purpose: wxHtml module for links & anchors
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for links & anchors
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_list.cpp
// Purpose: wxHtml module for lists
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for lists
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/dc.h"
#ifndef WXPRECOMP
#include "wx/brush.h"
#include "wx/dc.h"
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_pre.cpp
// Purpose: wxHtml module for <PRE> ... </PRE> tag (code citation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for <PRE> ... </PRE> tag (code citation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
+#if wxUSE_HTML && wxUSE_STREAMS
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_style.cpp
// Purpose: wxHtml module for parsing <style> tag
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for parsing <style> tag
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/m_tables.cpp
// Purpose: wxHtml module for tables
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtml module for tables
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
+#if wxUSE_HTML && wxUSE_STREAMS
+
{
wxString wd = tag.GetParam(wxT("WIDTH"));
{
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;
{
wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width);
m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
{
wxString wd = tag.GetParam(wxT("WIDTH"));
{
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);
{
int width = 0;
wxSscanf(wd.c_str(), wxT("%i%%"), &width);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+// Name: src/html/winpars.cpp
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose: wxHtmlParser class (generic parser)
// Author: Vaclav Slavik
// RCS-ID: $Id$
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
#include "wx/intl.h"
#include "wx/dc.h"
#ifndef WXPRECOMP
#include "wx/intl.h"
#include "wx/dc.h"
projects / wxWidgets.git / commitdiff
