radiant/cursor: get/set cursor position from widget instead of window

[xonotic/netradiant.git] / libs / gtkutil / dialog.cpp

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 6200ba64e62c7c6ce057086c182f188b8d411e8d..aa8aad47d0a873046151804c55d918f01c5ee973 100644 (file)
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -183,7 +183,7 @@ RadioHBox RadioHBox_new( StringArrayRange names ){
        auto radio = ui::RadioButton(ui::null);
        for ( StringArrayRange::Iterator i = names.first; i != names.last; ++i )
        {
-               radio = ui::RadioButton(GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) ));
+               radio = ui::RadioButton::from( gtk_radio_button_new_with_label( group, *i ) );
                radio.show();
                hbox.pack_start( radio, FALSE, FALSE, 0 );
 
@@ -210,7 +210,7 @@ PathEntry PathEntry_new(){
 
        // browse button
        auto button = ui::Button(ui::New);
-       button_set_icon( button, "ellipsis.bmp" );
+       button_set_icon( button, "ellipsis.png" );
        button.show();
        hbox.pack_end(button, FALSE, FALSE, 0);
 
@@ -222,7 +222,7 @@ PathEntry PathEntry_new(){
 void PathEntry_setPath( PathEntry& self, const char* path ){
        gtk_entry_set_text( self.m_entry, path );
 }
-typedef ReferenceCaller1<PathEntry, const char*, PathEntry_setPath> PathEntrySetPathCaller;
+typedef ReferenceCaller<PathEntry, void(const char*), PathEntry_setPath> PathEntrySetPathCaller;
 
 void BrowsedPathEntry_clicked( ui::Widget widget, BrowsedPathEntry* self ){
        self->m_browse( PathEntrySetPathCaller( self->m_entry ) );