[paragui-cvs] CVS: paragui/test Makefile.am,1.6.2.1,1.6.2.2 animation.cpp,1.2.2.1,1.2.2.2 configure.in,1.3,1.3.2.1 dblbuffer.cpp,1.4.2.2,1.4.2.3 dropdown.cpp,1.1,1.1.2.1 layouttest.cpp,1.1.1.1,1.1.1.1.2.1 list.cpp,1.1,1.1.2.1 paratest.cpp,1.9.2.1,1.9.2.2 tabbar.cpp,1.4,1.4.2.1 windowresize.cpp,1.1.2.1,1.1.2.2 windowtest.cpp,1.1.1.1.2.1,1.1.1.1.2.2

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        Makefile.am animation.cpp configure.in dblbuffer.cpp 
        dropdown.cpp layouttest.cpp list.cpp paratest.cpp tabbar.cpp 
        windowresize.cpp windowtest.cpp 
Log Message:
Added in patches from paragui-main
removed glSDL dependency
started preparing OpenGL drawable classes
As of this point most demos are working fine :)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/test/Makefile.am,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** Makefile.am 18 Jun 2002 22:40:39 -0000      1.6.2.1
--- Makefile.am 26 Jun 2002 03:25:04 -0000      1.6.2.2
***************
*** 4,35 ****
  
  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 = \
--- 4,35 ----
  
  listbox_SOURCES = list.cpp
! listbox_LDADD = ../src/libparagui2.la -lfreetype
  
  tabbar_SOURCES = tabbar.cpp
! tabbar_LDADD = ../src/libparagui2.la -lfreetype
  
  windowresize_SOURCES = windowresize.cpp
! windowresize_LDADD = ../src/libparagui2.la -lfreetype
  
  dropdown_SOURCES = dropdown.cpp
! dropdown_LDADD = ../src/libparagui2.la -lfreetype
  
  animation_SOURCES = animation.cpp
! animation_LDADD = ../src/libparagui2.la -lfreetype
  
  dblbuffer_SOURCES = dblbuffer.cpp
! dblbuffer_LDADD = ../src/libparagui2.la -lfreetype
  
  paratest_SOURCES = paratest.cpp
! paratest_LDADD = ../src/libparagui2.la -lfreetype
  
  navtest_SOURCES = navtest.cpp
! navtest_LDADD = ../src/libparagui2.la -lfreetype
  
  windowtest_SOURCES = windowtest.cpp
! windowtest_LDADD = ../src/libparagui2.la -lfreetype
  
  layouttest_SOURCES = layouttest.cpp
! layouttest_LDADD = ../src/libparagui2.la -lfreetype
  
  INCLUDES = \

Index: animation.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/animation.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** animation.cpp       18 Jun 2002 22:40:39 -0000      1.2.2.1
--- animation.cpp       26 Jun 2002 03:25:04 -0000      1.2.2.2
***************
*** 20,31 ****
  #define ID_APP_EXIT           1
  
! bool exit_handler(PG_Button* button, PG_Pointer* data) {
  
!       // we can pass in some pointer to data
!       // (in this case we get a pointer to the application object)
!       PG_Application* app = static_cast<PG_Application*>(data);
! 
!       // exit the application eventloop
!       app->Quit();
  
        // return true to signal that we have processed this message
--- 20,26 ----
  #define ID_APP_EXIT           1
  
! bool exit_handler(PG_Button* button) {
  
!       PG_Application::GetInstance().Quit();
  
        // return true to signal that we have processed this message
***************
*** 33,42 ****
  }
  
! bool handle_menu_click(PG_MenuItem* item, PG_Pointer* data) {
!       PG_Application* app = static_cast<PG_Application*>(data);
        
        switch (item->getId()) {
          case ID_APP_EXIT:
!               app->Quit();
                break;
        }
--- 28,37 ----
  }
  
! bool handle_menu_click(PG_MenuItem* item) {
!       PG_Application& app = PG_Application::GetInstance();
        
        switch (item->getId()) {
          case ID_APP_EXIT:
!               app.Quit();
                break;
        }
***************
*** 240,244 ****
  
        // every ParaGUI application need an application-object
!       PG_Application app;
  
        // let us escape with "ESC"
--- 235,239 ----
  
        // every ParaGUI application need an application-object
!       PG_Application& app = PG_Application::GetInstance();
  
        // let us escape with "ESC"
***************
*** 276,280 ****
  
        popmenu.addMenuItem("Nail", 99, slot(handle_menu_click)).
!         addMenuItem("Quit", ID_APP_EXIT, slot(handle_menu_click), &app);
   
        menubar.Add("File", &popmenu);
--- 271,275 ----
  
        popmenu.addMenuItem("Nail", 99, slot(handle_menu_click)).
!         addMenuItem("Quit", ID_APP_EXIT, slot(handle_menu_click));
   
        menubar.Add("File", &popmenu);
***************
*** 282,286 ****
        menubar.Show();
  
!       myButton.sigButtonClick.connect(slot(exit_handler), &app);
  
        // now we have to make the button visible
--- 277,281 ----
        menubar.Show();
  
!       myButton.sigButtonClick.connect(slot(exit_handler));
  
        // now we have to make the button visible

Index: configure.in
===================================================================
RCS file: /cvsroot/paragui/paragui/test/configure.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** configure.in        27 Apr 2002 15:36:55 -0000      1.3
--- configure.in        26 Jun 2002 03:25:04 -0000      1.3.2.1
***************
*** 37,41 ****
  dnl Check for PARAGUI
  
! AM_PATH_PARAGUI($PARAGUI_VERSION,
              :,
            AC_MSG_ERROR([*** PARAGUI version $PARAGUI_VERSION not found!])
--- 37,41 ----
  dnl Check for PARAGUI
  
! AM_PATH_PARAGUI2($PARAGUI_VERSION,
              :,
            AC_MSG_ERROR([*** PARAGUI version $PARAGUI_VERSION not found!])

Index: dblbuffer.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/dblbuffer.cpp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** dblbuffer.cpp       19 Jun 2002 09:17:13 -0000      1.4.2.2
--- dblbuffer.cpp       26 Jun 2002 03:25:04 -0000      1.4.2.3
***************
*** 142,146 ****
        Uint32 then, now, frames;
  
!       PG_Application app;
  
        numsprites = NUM_SPRITES;
--- 142,146 ----
        Uint32 then, now, frames;
  
!       PG_Application& app = PG_Application::GetInstance();
  
        numsprites = NUM_SPRITES;
***************
*** 172,176 ****
                if ( strcmp(argv[argc], "-gl") == 0 ) {
                        // dont ask why but it works -- Alex
!                       videoflags ^= SDL_GLSDL;
                        videoflags ^= SDL_HWSURFACE;
                        videoflags ^= SDL_DOUBLEBUF;
--- 172,176 ----
                if ( strcmp(argv[argc], "-gl") == 0 ) {
                        // dont ask why but it works -- Alex
!                       // videoflags ^= SDL_GLSDL; // Teunis commented out
                        videoflags ^= SDL_HWSURFACE;
                        videoflags ^= SDL_DOUBLEBUF;

Index: dropdown.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/dropdown.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** dropdown.cpp        15 Apr 2002 13:31:31 -0000      1.1
--- dropdown.cpp        26 Jun 2002 03:25:04 -0000      1.1.2.1
***************
*** 10,14 ****
  int main()
  {
!    PG_Application app;
     app.LoadTheme( "default" );
     app.InitScreen( 640, 480 );
--- 10,14 ----
  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.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** layouttest.cpp      15 Apr 2002 13:22:29 -0000      1.1.1.1
--- layouttest.cpp      26 Jun 2002 03:25:04 -0000      1.1.1.1.2.1
***************
*** 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: list.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/list.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** list.cpp    30 Apr 2002 08:46:13 -0000      1.1
--- list.cpp    26 Jun 2002 03:25:04 -0000      1.1.2.1
***************
*** 17,21 ****
  int main( int argc, char **argv )
  {
!       PG_Application app;
        
        app.LoadTheme( "default" );
--- 17,21 ----
  int main( int argc, char **argv )
  {
!       PG_Application& app = PG_Application::GetInstance();
        
        app.LoadTheme( "default" );

Index: paratest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/paratest.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** paratest.cpp        18 Jun 2002 22:40:39 -0000      1.9.2.1
--- paratest.cpp        26 Jun 2002 03:25:04 -0000      1.9.2.2
***************
*** 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;
  }
***************
*** 292,296 ****
        
        // construct the application object
!       PG_Application app;
        
        for(int c=1; c<argc; c++) {
--- 292,296 ----
        
        // construct the application object
!       PG_Application& app = PG_Application::GetInstance();
        
        for(int c=1; c<argc; c++) {
***************
*** 463,467 ****
  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        PG_Button quit(NULL, BTN_ID_CLOSE, PG_Rect(600,450,100,30), "Quit");
!       quit.sigButtonClick.connect(slot(handle_exit), &app);
        quit.Show();
  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
--- 463,467 ----
  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);
        PG_Button quit(NULL, BTN_ID_CLOSE, PG_Rect(600,450,100,30), "Quit");
!       quit.sigButtonClick.connect(slot(handle_exit));
        quit.Show();
  fprintf(stderr, "%s:%s:%i\n", __FILE__, __FUNCTION__, __LINE__);

Index: tabbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/tabbar.cpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** tabbar.cpp  28 Apr 2002 16:35:30 -0000      1.4
--- tabbar.cpp  26 Jun 2002 03:25:04 -0000      1.4.2.1
***************
*** 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.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** windowresize.cpp    18 Jun 2002 22:40:39 -0000      1.1.2.1
--- windowresize.cpp    26 Jun 2002 03:25:04 -0000      1.1.2.2
***************
*** 8,12 ****
  int main( int argc, char **argv )
  {
!    PG_Application app;
          PG_Draw::PG_DrawableSurface *screen;
  
--- 8,12 ----
  int main( int argc, char **argv )
  {
!    PG_Application& app = PG_Application::GetInstance();
          PG_Draw::PG_DrawableSurface *screen;
  

Index: windowtest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/windowtest.cpp,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** windowtest.cpp      18 Jun 2002 22:40:39 -0000      1.1.1.1.2.1
--- windowtest.cpp      26 Jun 2002 03:25:04 -0000      1.1.1.1.2.2
***************
*** 38,49 ****
  {
        // Change window test to be dynamic allocation for app, mywidget, and 
msgbox
-       PG_Application *app;
        CMyWidget *mywidget;
        PG_MessageBox *msgbox;
  
!       app=new PG_Application();
!       app->SetEmergencyQuit(true);
!       app->LoadTheme("default");
!       app->InitScreen(800,600,16,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));
--- 38,48 ----
  {
        // Change window test to be dynamic allocation for app, mywidget, and 
msgbox
        CMyWidget *mywidget;
        PG_MessageBox *msgbox;
  
!       PG_Application& app = PG_Application::GetInstance();
!       app.SetEmergencyQuit(true);
!       app.LoadTheme("default");
!       app.InitScreen(800,600,16,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));
***************
*** 71,82 ****
        delete mywidget;
        delete msgbox;
-       delete app;
        
        // Start the process over exactly the same
        // Crash happens here in physfs.c
!       app=new PG_Application();
!       app->SetEmergencyQuit(true);
!       app->LoadTheme("simple");
!       app->InitScreen(800,600,0,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));
--- 70,80 ----
        delete mywidget;
        delete msgbox;
        
        // Start the process over exactly the same
        // Crash happens here in physfs.c
!       // app=new PG_Application();
!       // app.SetEmergencyQuit(true);
!       app.LoadTheme("simple");
!       app.InitScreen(800,600,0,SDL_SWSURFACE);
  
        mywidget=new CMyWidget(NULL,PG_Rect(200,200,350,250));
***************
*** 97,101 ****
        delete mywidget;
        delete msgbox;
-       delete app;
                
        return 0;
--- 95,98 ----