raspbeguy
/
ponytracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Non, maintenant c'est bon.

This commit is contained in:
Raspbeguy 2014-05-21 18:27:57 +02:00
parent a8bdfd3e5b
commit ddbad7392c
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sources/mainTest/maintest.c
View File

@ -160,11 +160,7 @@ int main( int argc, char *argv[] ){
// insérer code GTK ici // insérer code GTK ici
GtkBuilder *monBuilder; GtkBuilder *monBuilder;
GtkWidget *maFenetre; GtkWidget *maFenetre;
<<<<<<< HEAD
char *str = NULL;
=======
char *str=NULL; char *str=NULL;
>>>>>>> 558938498b5f31ae16de379239153824be76559a
gtk_init( &argc, &argv ); gtk_init( &argc, &argv );
@ -176,10 +172,6 @@ int main( int argc, char *argv[] ){
maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetreprincipale")); maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetreprincipale"));
GtkLabel *labelNote = (GtkLabel*) gtk_builder_get_object(monBuilder,"button16"); GtkLabel *labelNote = (GtkLabel*) gtk_builder_get_object(monBuilder,"button16");
<<<<<<< HEAD
if (getNote(m,0,0)==0) str="Do";
else if (getNote(m,0,0)==1) str="Re";
=======
switch (getNote(m,0,0)) { switch (getNote(m,0,0)) {
case 0 : case 0 :
str="Do "; str="Do ";
@ -304,7 +296,6 @@ int main( int argc, char *argv[] ){
break; break;
} }
>>>>>>> 558938498b5f31ae16de379239153824be76559a
gtk_label_set_text(labelNote, str); gtk_label_set_text(labelNote, str);
gtk_widget_show_all (maFenetre); gtk_widget_show_all (maFenetre);