[paragui-cvs] CVS: paragui/test Makefile.am,1.6,1.7 dropdown.cpp,1.1,1.2 layouttest.cpp,1.1.1.1,1.2 paratest.cpp,1.9,1.10 tabbar.cpp,1.4,1.5 windowresize.cpp,1.1,1.2

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/test
In directory subversions:/tmp/cvs-serv31657/test

Modified Files:
        Makefile.am dropdown.cpp layouttest.cpp paratest.cpp 
        tabbar.cpp windowresize.cpp 
Log Message:
fixed build system



Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/test/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.am 30 Apr 2002 08:46:13 -0000      1.6
--- Makefile.am 26 Jun 2002 08:03:53 -0000      1.7
***************
*** 1,42 ****
  AUTOMAKE_OPTIONS = foreign
  
! noinst_PROGRAMS = listbox tabbar animation dropdown paratest dblbuffer 
navtest windowtest layouttest windowresize
  
  listbox_SOURCES = list.cpp
! listbox_LDADD = ../src/libparagui.la -lfreetype
  
  tabbar_SOURCES = tabbar.cpp
! tabbar_LDADD = ../src/libparagui.la -lfreetype
  
  windowresize_SOURCES = windowresize.cpp
! windowresize_LDADD = ../src/libparagui.la -lfreetype
  
  dropdown_SOURCES = dropdown.cpp
! dropdown_LDADD = ../src/libparagui.la -lfreetype
  
  animation_SOURCES = animation.cpp
! animation_LDADD = ../src/libparagui.la -lfreetype
  
  dblbuffer_SOURCES = dblbuffer.cpp
! dblbuffer_LDADD = ../src/libparagui.la -lfreetype
  
  paratest_SOURCES = paratest.cpp
! paratest_LDADD = ../src/libparagui.la -lfreetype
  
  navtest_SOURCES = navtest.cpp
! navtest_LDADD = ../src/libparagui.la -lfreetype
  
! windowtest_SOURCES = windowtest.cpp
! windowtest_LDADD = ../src/libparagui.la -lfreetype
  
  layouttest_SOURCES = layouttest.cpp
! layouttest_LDADD = ../src/libparagui.la -lfreetype
  
! INCLUDES = \
!       $(SDL_CFLAGS) \
!       $(SIGC_CFLAGS) \
!       $(EXPAT_INCLUDE) \
!       $(FREETYPE_CFLAGS) \
!       -I../include
  
  $(PACKAGE)-$(VERSION).tar.gz: dist
--- 1,37 ----
  AUTOMAKE_OPTIONS = foreign
  
! noinst_PROGRAMS = listbox tabbar animation dropdown paratest dblbuffer 
navtest layouttest windowresize
  
  listbox_SOURCES = list.cpp
! listbox_LDADD = $(PARAGUI_LIBS)
  
  tabbar_SOURCES = tabbar.cpp
! tabbar_LDADD = $(PARAGUI_LIBS)
  
  windowresize_SOURCES = windowresize.cpp
! windowresize_LDADD = $(PARAGUI_LIBS)
  
  dropdown_SOURCES = dropdown.cpp
! dropdown_LDADD = $(PARAGUI_LIBS)
  
  animation_SOURCES = animation.cpp
! animation_LDADD = $(PARAGUI_LIBS)
  
  dblbuffer_SOURCES = dblbuffer.cpp
! dblbuffer_LDADD = $(PARAGUI_LIBS)
  
  paratest_SOURCES = paratest.cpp
! paratest_LDADD = $(PARAGUI_LIBS)
  
  navtest_SOURCES = navtest.cpp
! navtest_LDADD = $(PARAGUI_LIBS)
  
! #windowtest_SOURCES = windowtest.cpp
! #windowtest_LDADD = $(PARAGUI_LIBS)
  
  layouttest_SOURCES = layouttest.cpp
! layouttest_LDADD = $(PARAGUI_LIBS)
  
! INCLUDES = $(PARAGUI_CFLAGS)
  
  $(PACKAGE)-$(VERSION).tar.gz: dist

Index: dropdown.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/dropdown.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dropdown.cpp        15 Apr 2002 13:31:31 -0000      1.1
--- dropdown.cpp        26 Jun 2002 08:03:53 -0000      1.2
***************
*** 10,14 ****
  int main()
  {
!    PG_Application app;
     app.LoadTheme( "default" );
     app.InitScreen( 640, 480 );
--- 10,15 ----
  int main()
  {
!    PG_Application& app = PG_Application::GetInstance();
!    
     app.LoadTheme( "default" );
     app.InitScreen( 640, 480 );

Index: layouttest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/layouttest.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** layouttest.cpp      15 Apr 2002 13:22:29 -0000      1.1.1.1
--- layouttest.cpp      26 Jun 2002 08:03:53 -0000      1.2
***************
*** 6,10 ****
  
        // construct the application object
!       PG_Application app;
  
        app.EnableBackground(true);
--- 6,10 ----
  
        // construct the application object
!       PG_Application& app = PG_Application::GetInstance();
  
        app.EnableBackground(true);

Index: paratest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/paratest.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** paratest.cpp        6 May 2002 11:18:03 -0000       1.9
--- paratest.cpp        26 Jun 2002 08:03:53 -0000      1.10
***************
*** 42,48 ****
  }
  
! bool handle_exit(PG_Pointer* data) {
!       PG_Application* app = static_cast<PG_Application*>(data);
!       app->Quit();
        return true;
  }
--- 42,48 ----
  }
  
! bool handle_exit() {
!       PG_Application& app = PG_Application::GetInstance();
!       app.Quit();
        return true;
  }
***************
*** 289,293 ****
        
        // construct the application object
!       PG_Application app;
        
        for(int c=1; c<argc; c++) {
--- 289,293 ----
        
        // construct the application object
!       PG_Application& app = PG_Application::GetInstance();
        
        for(int c=1; c<argc; c++) {
***************
*** 460,464 ****
  
        PG_Button quit(NULL, BTN_ID_CLOSE, PG_Rect(600,450,100,30), "Quit");
!       quit.sigButtonClick.connect(slot(handle_exit), &app);
        quit.Show();
  
--- 460,464 ----
  
        PG_Button quit(NULL, BTN_ID_CLOSE, PG_Rect(600,450,100,30), "Quit");
!       quit.sigButtonClick.connect(slot(handle_exit));
        quit.Show();
  

Index: tabbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/tabbar.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tabbar.cpp  28 Apr 2002 16:35:30 -0000      1.4
--- tabbar.cpp  26 Jun 2002 08:03:53 -0000      1.5
***************
*** 46,50 ****
  int main( int argc, char **argv )
  {
!       PG_Application app;
        
        app.LoadTheme( "default" );
--- 46,50 ----
  int main( int argc, char **argv )
  {
!       PG_Application& app = PG_Application::GetInstance();
        
        app.LoadTheme( "default" );

Index: windowresize.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/windowresize.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** windowresize.cpp    15 Apr 2002 13:31:31 -0000      1.1
--- windowresize.cpp    26 Jun 2002 08:03:53 -0000      1.2
***************
*** 5,9 ****
  int main( int argc, char **argv )
  {
!    PG_Application app;
  
     app.LoadTheme( "default" );
--- 5,9 ----
  int main( int argc, char **argv )
  {
!    PG_Application& app = PG_Application::GetInstance();
  
     app.LoadTheme( "default" );