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

Fixed the controlgallery example. Reenabled it in make examples. Changed .travis.yml to build the test first.

This commit is contained in:
Pietro Gagliardi 2016-01-06 19:38:27 -05:00
parent 6a15e23897
commit 68a3476f35
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -9,8 +9,8 @@ script:
- sudo apt-get update - sudo apt-get update
- sudo apt-get install libgtk-3-dev -y || sudo apt-cache search libgtk3 - sudo apt-get install libgtk-3-dev -y || sudo apt-cache search libgtk3
- make -f GNUmakefile - make -f GNUmakefile
- make -f GNUmakefile examples - make -f GNUmakefile test
- make -f GNUmakefile test - make -f GNUmakefile examples
# TODO osx # TODO osx
# need to figure out how to force language: objective-c and turn off the apt-get rules # need to figure out how to force language: objective-c and turn off the apt-get rules

2
GNUmakefile
View File

@ -62,7 +62,7 @@ example: libui
@$(MAKE) -f build/GNUmakefile.example inlibuibuild=1 @$(MAKE) -f build/GNUmakefile.example inlibuibuild=1
examples: examples:
#@$(MAKE) -f GNUmakefile example EXAMPLE=controlgallery @$(MAKE) -f GNUmakefile example EXAMPLE=controlgallery
@$(MAKE) -f GNUmakefile example EXAMPLE=histogram @$(MAKE) -f GNUmakefile example EXAMPLE=histogram
.PHONY: examples .PHONY: examples

12
examples/controlgallery/main.c
View File

@ -22,12 +22,12 @@ static void openClicked(uiMenuItem *item, uiWindow *w, void *data)
{ {
char *filename; char *filename;
filename = uiOpenFile(); filename = uiOpenFile(mainwin);
if (filename == NULL) { if (filename == NULL) {
uiMsgBoxError("No file selected", "Don't be alarmed!"); uiMsgBoxError(mainwin, "No file selected", "Don't be alarmed!");
return; return;
} }
uiMsgBox("File selected", filename); uiMsgBox(mainwin, "File selected", filename);
uiFreeText(filename); uiFreeText(filename);
} }
@ -35,12 +35,12 @@ static void saveClicked(uiMenuItem *item, uiWindow *w, void *data)
{ {
char *filename; char *filename;
filename = uiSaveFile(); filename = uiSaveFile(mainwin);
if (filename == NULL) { if (filename == NULL) {
uiMsgBoxError("No file selected", "Don't be alarmed!"); uiMsgBoxError(mainwin, "No file selected", "Don't be alarmed!");
return; return;
} }
uiMsgBox("File selected (don't worry, it's still there)", filename); uiMsgBox(mainwin, "File selected (don't worry, it's still there)", filename);
uiFreeText(filename); uiFreeText(filename);
} }