mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-15 18:20:20 +00:00
Removed GTK2/GTK3 dual-path preprocessor branches across src/fe-gtk by keeping GTK3-native paths only, including the high-density targets you prioritized (xtext.c, setup.c, maingui.c, gtkutil.c, servlistgui.c).
Removed GTK2 compatibility shims from headers (fe-gtk.h, gtkutil.h), leaving direct GTK3-facing declarations/includes only (and platform-specific guards unrelated to GTK2 kept as-is). Cleaned GTK2-specific comments/wording now that behavior is GTK3-native (menu accelerator note and emoji/userlist comment blocks).
This commit is contained in:
@@ -38,16 +38,9 @@
|
||||
#include "palette.h"
|
||||
#include "textgui.h"
|
||||
|
||||
#if HAVE_GTK3
|
||||
#define ICON_TEXTEVENT_SAVE_AS "document-save-as"
|
||||
#define ICON_TEXTEVENT_OPEN "document-open"
|
||||
#define ICON_TEXTEVENT_OK "dialog-ok"
|
||||
#endif
|
||||
#if !HAVE_GTK3
|
||||
#define ICON_TEXTEVENT_SAVE_AS GTK_STOCK_SAVE_AS
|
||||
#define ICON_TEXTEVENT_OPEN GTK_STOCK_OPEN
|
||||
#define ICON_TEXTEVENT_OK GTK_STOCK_OK
|
||||
#endif
|
||||
|
||||
extern struct text_event te[];
|
||||
extern char *pntevts_text[];
|
||||
@@ -462,11 +455,7 @@ pevent_dialog_show ()
|
||||
TRUE, FALSE, pevent_dialog_close, NULL,
|
||||
600, 455, &vbox, 0);
|
||||
|
||||
#if HAVE_GTK3
|
||||
pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
|
||||
#elif !HAVE_GTK3
|
||||
pane = gtk_vpaned_new ();
|
||||
#endif
|
||||
gtk_box_pack_start (GTK_BOX (vbox), pane, TRUE, TRUE, 0);
|
||||
|
||||
pevent_dialog_list = pevent_treeview_new (pane);
|
||||
@@ -485,13 +474,8 @@ pevent_dialog_show ()
|
||||
gtk_container_add (GTK_CONTAINER (wid), pevent_dialog_twid);
|
||||
gtk_xtext_set_font (GTK_XTEXT (pevent_dialog_twid), prefs.hex_text_font);
|
||||
|
||||
#if HAVE_GTK3
|
||||
hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
|
||||
#elif !HAVE_GTK3
|
||||
hbox = gtk_hbutton_box_new ();
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
|
||||
#endif
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 4);
|
||||
gtkutil_button (hbox, ICON_TEXTEVENT_SAVE_AS, NULL, pevent_save_cb,
|
||||
(void *) 1, _("Save As..."));
|
||||
|
||||
Reference in New Issue
Block a user