Fixed the controlgallery example. Reenabled it in make examples. Changed .travis.yml to build the test first.
This commit is contained in:
parent
6a15e23897
commit
68a3476f35
|
@ -9,8 +9,8 @@ script:
|
|||
- sudo apt-get update
|
||||
- sudo apt-get install libgtk-3-dev -y || sudo apt-cache search libgtk3
|
||||
- make -f GNUmakefile
|
||||
- make -f GNUmakefile examples
|
||||
- make -f GNUmakefile test
|
||||
- make -f GNUmakefile test
|
||||
- make -f GNUmakefile examples
|
||||
|
||||
# TODO osx
|
||||
# need to figure out how to force language: objective-c and turn off the apt-get rules
|
||||
|
|
|
@ -62,7 +62,7 @@ example: libui
|
|||
@$(MAKE) -f build/GNUmakefile.example inlibuibuild=1
|
||||
|
||||
examples:
|
||||
#@$(MAKE) -f GNUmakefile example EXAMPLE=controlgallery
|
||||
@$(MAKE) -f GNUmakefile example EXAMPLE=controlgallery
|
||||
@$(MAKE) -f GNUmakefile example EXAMPLE=histogram
|
||||
|
||||
.PHONY: examples
|
||||
|
|
|
@ -22,12 +22,12 @@ static void openClicked(uiMenuItem *item, uiWindow *w, void *data)
|
|||
{
|
||||
char *filename;
|
||||
|
||||
filename = uiOpenFile();
|
||||
filename = uiOpenFile(mainwin);
|
||||
if (filename == NULL) {
|
||||
uiMsgBoxError("No file selected", "Don't be alarmed!");
|
||||
uiMsgBoxError(mainwin, "No file selected", "Don't be alarmed!");
|
||||
return;
|
||||
}
|
||||
uiMsgBox("File selected", filename);
|
||||
uiMsgBox(mainwin, "File selected", filename);
|
||||
uiFreeText(filename);
|
||||
}
|
||||
|
||||
|
@ -35,12 +35,12 @@ static void saveClicked(uiMenuItem *item, uiWindow *w, void *data)
|
|||
{
|
||||
char *filename;
|
||||
|
||||
filename = uiSaveFile();
|
||||
filename = uiSaveFile(mainwin);
|
||||
if (filename == NULL) {
|
||||
uiMsgBoxError("No file selected", "Don't be alarmed!");
|
||||
uiMsgBoxError(mainwin, "No file selected", "Don't be alarmed!");
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue