if ( type == eMB_OK ) {
- GtkButton* button = create_modal_dialog_button( "OK", ok_button );
+ auto button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
- widget_make_default( GTK_WIDGET( button ) );
- gtk_widget_show( GTK_WIDGET( button ) );
+ widget_make_default( button );
+ button.show();
dialog.ret = eIDOK;
}
else if ( type == eMB_OKCANCEL ) {
{
- GtkButton* button = create_modal_dialog_button( "OK", ok_button );
+ auto button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
- widget_make_default( GTK_WIDGET( button ) );
- gtk_widget_show( GTK_WIDGET( button ) );
+ widget_make_default( button );
+ button.show();
}
{
}
else if ( type == eMB_YESNOCANCEL ) {
{
- GtkButton* button = create_modal_dialog_button( "Yes", yes_button );
+ auto button = create_modal_dialog_button( "Yes", yes_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
- gtk_widget_show( GTK_WIDGET( button ) );
+ widget_make_default( button );
+ button.show();
}
{
}
else if ( type == eMB_NOYES ) {
{
- GtkButton* button = create_modal_dialog_button( "No", no_button );
+ auto button = create_modal_dialog_button( "No", no_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
- gtk_widget_show( GTK_WIDGET( button ) );
+ widget_make_default( button );
+ button.show();
}
{
GtkButton* button = create_modal_dialog_button( "Yes", yes_button );
else /* if (type == eMB_YESNO) */
{
{
- GtkButton* button = create_modal_dialog_button( "Yes", yes_button );
+ auto button = create_modal_dialog_button( "Yes", yes_button );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), TRUE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_show( GTK_WIDGET( button ) );
}
#include "warnings.h"
#include "debugging/debugging.h"
-inline void widget_set_visible( GtkWidget* widget, bool shown ){
+inline void widget_set_visible( ui::Widget widget, bool shown ){
if ( shown ) {
- gtk_widget_show( widget );
+ widget.show();
}
else
{
}
}
-inline bool widget_is_visible( GtkWidget* widget ){
+inline bool widget_is_visible( ui::Widget widget ){
return gtk_widget_get_visible( widget ) != FALSE;
}
-inline void widget_toggle_visible( GtkWidget* widget ){
+inline void widget_toggle_visible( ui::Widget widget ){
widget_set_visible( widget, !widget_is_visible( widget ) );
}
ToggleShown( const ToggleShown& other ); // NOT COPYABLE
ToggleShown& operator=( const ToggleShown& other ); // NOT ASSIGNABLE
-static gboolean notify_visible( GtkWidget* widget, gpointer dummy, ToggleShown* self ){
+static gboolean notify_visible( ui::Widget widget, gpointer dummy, ToggleShown* self ){
self->update();
return FALSE;
}
-static gboolean destroy( GtkWidget* widget, ToggleShown* self ){
+static gboolean destroy( ui::Widget widget, ToggleShown* self ){
self->m_shownDeferred = gtk_widget_get_visible( self->m_widget ) != FALSE;
- self->m_widget = 0;
+ self->m_widget = ui::Widget(nullptr);
return FALSE;
}
public:
-GtkWidget* m_widget;
+ui::Widget m_widget;
ToggleItem m_item;
ToggleShown( bool shown )
m_item.update();
}
bool active() const {
- if ( m_widget == 0 ) {
+ if ( !m_widget ) {
return m_shownDeferred;
}
else
}
typedef MemberCaller1<ToggleShown, const BoolImportCallback&, &ToggleShown::exportActive> ActiveCaller;
void set( bool shown ){
- if ( m_widget == 0 ) {
+ if ( !m_widget ) {
m_shownDeferred = shown;
}
else
widget_toggle_visible( m_widget );
}
typedef MemberCaller<ToggleShown, &ToggleShown::toggle> ToggleCaller;
-void connect( GtkWidget* widget ){
+void connect( ui::Widget widget ){
m_widget = widget;
widget_set_visible( m_widget, m_shownDeferred );
g_signal_connect( G_OBJECT( m_widget ), "notify::visible", G_CALLBACK( notify_visible ), this );
typedef ReferenceCaller<GtkWidget, widget_queue_draw> WidgetQueueDrawCaller;
-inline void widget_make_default( GtkWidget* widget ){
+inline void widget_make_default( ui::Widget widget ){
gtk_widget_set_can_default( widget, true );
gtk_widget_grab_default( widget );
}
{
const char* m_name;
-static gboolean focus_in( GtkWidget *widget, GdkEventFocus *event, WidgetFocusPrinter* self ){
+static gboolean focus_in( ui::Widget widget, GdkEventFocus *event, WidgetFocusPrinter* self ){
globalOutputStream() << self->m_name << " takes focus\n";
return FALSE;
}
-static gboolean focus_out( GtkWidget *widget, GdkEventFocus *event, WidgetFocusPrinter* self ){
+static gboolean focus_out( ui::Widget widget, GdkEventFocus *event, WidgetFocusPrinter* self ){
globalOutputStream() << self->m_name << " loses focus\n";
return FALSE;
}
public:
WidgetFocusPrinter( const char* name ) : m_name( name ){
}
-void connect( GtkWidget* widget ){
+void connect( ui::Widget widget ){
g_signal_connect( G_OBJECT( widget ), "focus_in_event", G_CALLBACK( focus_in ), this );
g_signal_connect( G_OBJECT( widget ), "focus_out_event", G_CALLBACK( focus_out ), this );
}
void CamWnd_setParent( CamWnd& camwnd, ui::Window parent ){
camwnd.m_parent = parent;
- g_camera_shown.connect( GTK_WIDGET( camwnd.m_parent ) );
+ g_camera_shown.connect( camwnd.m_parent );
}
void CamWnd_Update( CamWnd& camwnd ){
gtk_widget_show( spacer );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( spacer ), TRUE, TRUE, 0 );
- GtkButton* button = create_modal_dialog_button( "Close", dialog.m_close_button );
+ auto button = create_modal_dialog_button( "Close", dialog.m_close_button );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_grab_default( GTK_WIDGET( button ) );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
void EntityList_SetShown( bool shown ){
- widget_set_visible( GTK_WIDGET( getEntityList().m_window ), shown );
+ widget_set_visible( getEntityList().m_window, shown );
}
void EntityList_toggleShown(){
bool GroupDialog_isShown(){
- return widget_is_visible( GTK_WIDGET( g_GroupDlg.m_window ) );
+ return widget_is_visible( g_GroupDlg.m_window );
}
void GroupDialog_setShown( bool shown ){
shown ? g_GroupDlg.Show() : g_GroupDlg.Hide();
GtkVBox* vbox = create_dialog_vbox( 4 );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
{
- GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
+ auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
}
{
GtkVBox* vbox = create_dialog_vbox( 4 );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 );
{
- GtkButton* button = create_modal_dialog_button( "OK", ok_button );
+ auto button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
}
{
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 );
{
- GtkButton* button = create_modal_dialog_button( "OK", ok_button );
+ auto button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE );
}
{
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 );
{
- GtkButton* button = create_modal_dialog_button( "OK", ok_button );
+ auto button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE );
}
{
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( label ), FALSE, FALSE, 0 );
}
{
- GtkButton* button = create_modal_dialog_button( "OK", ok_button );
+ auto button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE );
}
}
GtkHBox* hbox = create_dialog_hbox( 4 );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox ), TRUE, TRUE, 0 );
{
- GtkButton* button = create_dialog_button( "Find", G_CALLBACK( dialog_button_ok ), &dialog );
+ auto button = create_dialog_button( "Find", G_CALLBACK( dialog_button_ok ), &dialog );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
}
{
GtkVBox* vbox = create_dialog_vbox( 4 );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
{
- GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
+ auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_grab_focus( GTK_WIDGET( button ) );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
}
GtkVBox* vbox = create_dialog_vbox( 4 );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), FALSE, FALSE, 0 );
{
- GtkButton* button = create_modal_dialog_button( "OK", ok_button );
+ auto button = create_modal_dialog_button( "OK", ok_button );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel_group, GDK_Return, (GdkModifierType)0, GTK_ACCEL_VISIBLE );
}
{
GtkVBox* vbox = create_dialog_vbox( 4 );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
{
- GtkButton* button = create_dialog_button( "OK", G_CALLBACK( rotatedlg_ok ), &g_rotate_dialog );
+ auto button = create_dialog_button( "OK", G_CALLBACK( rotatedlg_ok ), &g_rotate_dialog );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
}
{
GtkVBox* vbox = create_dialog_vbox( 4 );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox ), TRUE, TRUE, 0 );
{
- GtkButton* button = create_dialog_button( "OK", G_CALLBACK( scaledlg_ok ), &g_scale_dialog );
+ auto button = create_dialog_button( "OK", G_CALLBACK( scaledlg_ok ), &g_scale_dialog );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- widget_make_default( GTK_WIDGET( button ) );
+ widget_make_default( button );
gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
}
{
ToggleShown g_xy_top_shown( true );
void XY_Top_Shown_Construct( ui::Window parent ){
- g_xy_top_shown.connect( GTK_WIDGET( parent ) );
+ g_xy_top_shown.connect( parent );
}
ToggleShown g_yz_side_shown( false );
void YZ_Side_Shown_Construct( ui::Window parent ){
- g_yz_side_shown.connect( GTK_WIDGET( parent ) );
+ g_yz_side_shown.connect( parent );
}
ToggleShown g_xz_front_shown( false );
void XZ_Front_Shown_Construct( ui::Window parent ){
- g_xz_front_shown.connect( GTK_WIDGET( parent ) );
+ g_xz_front_shown.connect( parent );
}