quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkCombo -> GtkComboBox

Browse Source
This commit is contained in:
Garux 2020-05-21 04:53:43 +03:00
parent 3edde6c857
commit a212ff3b27
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/bobtoolz/dialogs/dialogs-gtk.cpp
View File

@ -107,9 +107,9 @@ static void dialog_button_callback_settex( GtkWidget *widget, gpointer data ){
TwinWidget* tw = (TwinWidget*)data; TwinWidget* tw = (TwinWidget*)data;
GtkEntry* entry = GTK_ENTRY( tw->one ); GtkEntry* entry = GTK_ENTRY( tw->one );
GtkCombo* combo = GTK_COMBO( tw->two ); GtkComboBox* combo = GTK_COMBO_BOX( tw->two );
const gchar* tex = gtk_entry_get_text( GTK_ENTRY( combo->entry ) ); const gchar* tex = gtk_entry_get_text( GTK_ENTRY( gtk_bin_get_child( GTK_BIN( combo ) ) ) );
gtk_entry_set_text( entry, tex ); gtk_entry_set_text( entry, tex );
} }
@ -882,10 +882,10 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
gtk_widget_realize( window ); gtk_widget_realize( window );
char buffer[256]; char buffer[256];
GList *listMainTextures = NULL; GtkListStore *listMainTextures = gtk_list_store_new( 1, G_TYPE_STRING );
GList *listTrimTextures = NULL; GtkListStore *listTrimTextures = gtk_list_store_new( 1, G_TYPE_STRING );
LoadGList( GetFilename( buffer, "plugins/bt/door-tex.txt" ), &listMainTextures ); LoadListStore( GetFilename( buffer, "bt/door-tex.txt" ), listMainTextures );
LoadGList( GetFilename( buffer, "plugins/bt/door-tex-trim.txt" ), &listTrimTextures ); LoadListStore( GetFilename( buffer, "bt/door-tex-trim.txt" ), listTrimTextures );
vbox = gtk_vbox_new( FALSE, 10 ); vbox = gtk_vbox_new( FALSE, 10 );
gtk_container_add( GTK_CONTAINER( window ), vbox ); gtk_container_add( GTK_CONTAINER( window ), vbox );
@ -961,10 +961,9 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
// djbob: lists added // djbob: lists added
comboMain = gtk_combo_new(); comboMain = gtk_combo_box_new_with_model_and_entry( GTK_TREE_MODEL( listMainTextures ) );
gtk_combo_box_set_entry_text_column( GTK_COMBO_BOX( comboMain ), 0 );
gtk_box_pack_start( GTK_BOX( hbox ), comboMain, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( hbox ), comboMain, FALSE, FALSE, 0 );
gtk_combo_set_popdown_strings( GTK_COMBO( comboMain ), listMainTextures );
gtk_combo_set_use_arrows( GTK_COMBO( comboMain ), 1 );
gtk_widget_show( comboMain ); gtk_widget_show( comboMain );
tw1.one = textFrontBackTex; tw1.one = textFrontBackTex;
@ -981,10 +980,9 @@ EMessageBoxReturn DoDoorsBox( DoorRS* rs ){
gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
gtk_widget_show( hbox ); gtk_widget_show( hbox );
comboTrim = gtk_combo_new(); comboTrim = gtk_combo_box_new_with_model_and_entry( GTK_TREE_MODEL( listTrimTextures ) );
gtk_combo_box_set_entry_text_column( GTK_COMBO_BOX( comboTrim ), 0 );
gtk_box_pack_start( GTK_BOX( hbox ), comboTrim, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( hbox ), comboTrim, FALSE, FALSE, 0 );
gtk_combo_set_popdown_strings( GTK_COMBO( comboTrim ), listTrimTextures );
gtk_combo_set_use_arrows( GTK_COMBO( comboMain ), 1 );
gtk_widget_show( comboTrim ); gtk_widget_show( comboTrim );
tw2.one = textTrimTex; tw2.one = textTrimTex;

8
contrib/bobtoolz/lists.cpp
View File

@ -19,7 +19,7 @@
#include "lists.h" #include "lists.h"
#include <glib.h> #include <gtk/gtk.h>
#include "misc.h" #include "misc.h"
@ -50,7 +50,7 @@ bool LoadExclusionList( char* filename, std::list<Str>* exclusionList ){
return FALSE; return FALSE;
} }
bool LoadGList( char* filename, GList** loadlist ){ bool LoadListStore( char* filename, GtkListStore* loadlist ){
FILE* eFile = fopen( filename, "r" ); FILE* eFile = fopen( filename, "r" );
if ( eFile ) { if ( eFile ) {
char buffer[256]; char buffer[256];
@ -61,9 +61,7 @@ bool LoadGList( char* filename, GList** loadlist ){
fscanf( eFile, "%s\n", buffer ); fscanf( eFile, "%s\n", buffer );
if ( strlen( buffer ) > 0 ) { if ( strlen( buffer ) > 0 ) {
char* buffer2 = new char[strlen( buffer ) + 1]; gtk_list_store_insert_with_values( loadlist, NULL, -1, 0, buffer, -1 );
strcpy( buffer2, buffer );
*loadlist = g_list_append( *loadlist, buffer2 );
} }
else{ else{
cnt++; cnt++;

4
contrib/bobtoolz/lists.h
View File

@ -19,7 +19,7 @@
#include <list> #include <list>
#include "str.h" #include "str.h"
typedef struct _GList GList; typedef struct _GtkListStore GtkListStore;
bool LoadExclusionList( char* filename, std::list<Str>* exclusionList ); bool LoadExclusionList( char* filename, std::list<Str>* exclusionList );
bool LoadGList( char* filename, GList** loadlist ); bool LoadListStore( char* filename, GtkListStore* loadlist );

6
contrib/camera/dialogs.h
View File

@ -24,14 +24,8 @@
Copyright (C) 2002 Splash Damage Ltd. Copyright (C) 2002 Splash Damage Ltd.
*/ */
struct TwinWidget {
GtkWidget* one;
GtkWidget* two;
};
void dialog_button_callback( GtkWidget *widget, gpointer data ); void dialog_button_callback( GtkWidget *widget, gpointer data );
gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ); gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data );
//void dialog_button_callback_settex (GtkWidget *widget, gpointer data);
void RefreshCamListCombo( void ); void RefreshCamListCombo( void );
GtkWidget *CreateCameraInspectorDialog( void ); GtkWidget *CreateCameraInspectorDialog( void );