interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some compilation fixes.

This commit is contained in:
Pietro Gagliardi 2015-06-14 19:58:00 -04:00
parent b5d20864cb
commit c5fa717c7d
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
redo/stubs/checkbox.c
View File

@ -63,7 +63,6 @@ static void checkboxSetChecked(uiCheckbox *cc, int checked)
uiCheckbox *uiNewCheckbox(const char *text) uiCheckbox *uiNewCheckbox(const char *text)
{ {
struct checkbox *c; struct checkbox *c;
WCHAR *wtext;
c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox()); c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox());

12
redo/unix/GNUmakeinc.mk
View File

@ -2,15 +2,21 @@
osCFILES = \ osCFILES = \
unix/alloc.c \ unix/alloc.c \
unix/bin.c \
unix/button.c \ unix/button.c \
unix/checkbox.c \ unix/checkbox.c \
unix/container.c \ unix/combobox.c \
unix/control.c \
unix/datetimepicker.c \
unix/entry.c \ unix/entry.c \
unix/group.c \
unix/label.c \ unix/label.c \
unix/main.c \ unix/main.c \
unix/menu.c \ unix/menu.c \
unix/newcontrol.c \ unix/progressbar.c \
unix/radiobuttons.c \
unix/separator.c \
unix/slider.c \
unix/spinbox.c \
unix/tab.c \ unix/tab.c \
unix/text.c \ unix/text.c \
unix/util.c \ unix/util.c \

1
redo/unix/checkbox.c
View File

@ -63,7 +63,6 @@ static void checkboxSetChecked(uiCheckbox *cc, int checked)
uiCheckbox *uiNewCheckbox(const char *text) uiCheckbox *uiNewCheckbox(const char *text)
{ {
struct checkbox *c; struct checkbox *c;
WCHAR *wtext;
c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox()); c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox());

6
redo/unix/combobox.c
View File

@ -22,7 +22,7 @@ static void comboboxAppend(uiCombobox *cc, const char *text)
PUT_CODE_HERE; PUT_CODE_HERE;
} }
static uiCombobox *finishNewCombobox(OSTHING OSARG) static uiCombobox *finishNewCombobox(GtkWidget (*newfunc)(void))
{ {
struct combobox *c; struct combobox *c;
@ -39,10 +39,10 @@ static uiCombobox *finishNewCombobox(OSTHING OSARG)
uiCombobox *uiNewCombobox(void) uiCombobox *uiNewCombobox(void)
{ {
return finishNewCombobox(OSARGNONEDITABLE); return finishNewCombobox(gtk_combo_box_text_new);
} }
uiCombobox *uiNewEditableCombobox(void) uiCombobox *uiNewEditableCombobox(void)
{ {
return finishNewCombobox(OSARGEDITABLE); return finishNewCombobox(gtk_combo_box_text_new_with_entry);
} }

2
redo/unix/uipriv_unix.h
View File

@ -4,7 +4,7 @@
#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_4 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_4
#define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_4 #define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_4
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "../ui.h" #include "../out/ui.h"
#include "../ui_unix.h" #include "../ui_unix.h"
#include "../uipriv.h" #include "../uipriv.h"

8
redo/unix/window.c
View File

@ -49,8 +49,8 @@ static void windowCommitDestroy(uiControl *c)
gtk_widget_hide(w->widget); gtk_widget_hide(w->widget);
// now destroy the bin // now destroy the bin
// we need to remove the bin from its parent first // we need to remove the bin from its parent first
uiBinRemoveOSParent(w->bin); //TODO uiBinRemoveOSParent(w->bin);
uiControlDestroy(uiControl(w->bin)); //TODO uiControlDestroy(uiControl(w->bin));
// now destroy the menus, if any // now destroy the menus, if any
if (w->menubar != NULL) if (w->menubar != NULL)
freeMenubar(w->menubar); freeMenubar(w->menubar);
@ -171,14 +171,14 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
gtk_container_add(w->vboxContainer, w->menubar); gtk_container_add(w->vboxContainer, w->menubar);
} }
w->bin = newBin(); /*TODO w->bin = newBin();
binWidget = GTK_WIDGET(uiControlHandle(uiControl(w->bin))); binWidget = GTK_WIDGET(uiControlHandle(uiControl(w->bin)));
gtk_widget_set_hexpand(binWidget, TRUE); gtk_widget_set_hexpand(binWidget, TRUE);
gtk_widget_set_halign(binWidget, GTK_ALIGN_FILL); gtk_widget_set_halign(binWidget, GTK_ALIGN_FILL);
gtk_widget_set_vexpand(binWidget, TRUE); gtk_widget_set_vexpand(binWidget, TRUE);
gtk_widget_set_valign(binWidget, GTK_ALIGN_FILL); gtk_widget_set_valign(binWidget, GTK_ALIGN_FILL);
uiBinSetOSParent(w->bin, (uintptr_t) (w->vboxContainer)); uiBinSetOSParent(w->bin, (uintptr_t) (w->vboxContainer));
*/
// show everything in the vbox, but not the GtkWindow itself // show everything in the vbox, but not the GtkWindow itself
gtk_widget_show_all(w->vboxWidget); gtk_widget_show_all(w->vboxWidget);