No real changes, just make wxWindow::CanScroll() virtual.

[wxWidgets.git] / include / wx / gtk / assertdlg_gtk.h

diff --git a/include/wx/gtk/assertdlg_gtk.h b/include/wx/gtk/assertdlg_gtk.h
index 228cf02433116cd7a3f37afdcbbdd2c87a7f3d09..098e9b1123d298870ce8c3565c3ea99a94e95770 100644 (file)
--- a/include/wx/gtk/assertdlg_gtk.h
+++ b/include/wx/gtk/assertdlg_gtk.h
@@ -1,21 +1,13 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        assertdlg_gtk.h
+// Name:        wx/gtk/assertdlg_gtk.h

 // Purpose:     GtkAssertDialog
 // Author:      Francesco Montorsi
 // Purpose:     GtkAssertDialog
 // Author:      Francesco Montorsi

-// Id:          $Id$

 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 

-#ifndef __GTK_ASSERTDLG_H__
-#define __GTK_ASSERTDLG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
+#ifndef _WX_GTK_ASSERTDLG_H_
+#define _WX_GTK_ASSERTDLG_H_

 
 #define GTK_TYPE_ASSERT_DIALOG            (gtk_assert_dialog_get_type ())
 #define GTK_ASSERT_DIALOG(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialog))
 
 #define GTK_TYPE_ASSERT_DIALOG            (gtk_assert_dialog_get_type ())
 #define GTK_ASSERT_DIALOG(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialog))


@@ -37,6 +29,8 @@ struct _GtkAssertDialog
     GtkWidget *message;
     GtkWidget *treeview;
 
     GtkWidget *message;
     GtkWidget *treeview;
 

+    GtkWidget *shownexttime;
+

     /* callback for processing the stack frame */
     GtkAssertDialogStackFrameCallback callback;
     void *userdata;
     /* callback for processing the stack frame */
     GtkAssertDialogStackFrameCallback callback;
     void *userdata;


@@ -57,8 +51,8 @@ typedef enum
 
 
 
 
 
 

-GType gtk_assert_dialog_get_type();
-GtkWidget *gtk_assert_dialog_new();
+GType gtk_assert_dialog_get_type(void);
+GtkWidget *gtk_assert_dialog_new(void);

 
 /* get the assert message */
 gchar *gtk_assert_dialog_get_message(GtkAssertDialog *assertdlg);
 
 /* get the assert message */
 gchar *gtk_assert_dialog_get_message(GtkAssertDialog *assertdlg);


@@ -77,14 +71,7 @@ void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
 /* appends a stack frame to the dialog */
 void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
                                           const gchar *function,
 /* appends a stack frame to the dialog */
 void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
                                           const gchar *function,

-                                          const gchar *arguments,

                                           const gchar *sourcefile,
                                           guint line_number);
 
                                           const gchar *sourcefile,
                                           guint line_number);
 

-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GTK_ASSERTDLG_H__ */
-
-
+#endif /* _WX_GTK_ASSERTDLG_H_ */