paragui-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paragui-cvs] CVS: paragui/test stress1.cpp,1.1,1.2 stress2.cpp,1.1,1.2


From: Alexander Pipelka <address@hidden>
Subject: [paragui-cvs] CVS: paragui/test stress1.cpp,1.1,1.2 stress2.cpp,1.1,1.2 writefile.cpp,1.1,1.2 .cvsignore,1.2,1.3 Makefile.am,1.9,1.10 animation.cpp,1.3,1.4 dblbuffer.cpp,1.5,1.6 layouttest.cpp,1.2,1.3 list.cpp,1.3,1.4 paratest.cpp,1.12,1.13 pokus.xml,1.3,1.4 windowtest.cpp,1.1.1.1,1.2 autogen.sh,1.1.1.1,NONE
Date: Sun, 18 Aug 2002 04:12:57 -0400

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

Modified Files:
        .cvsignore Makefile.am animation.cpp dblbuffer.cpp 
        layouttest.cpp list.cpp paratest.cpp pokus.xml windowtest.cpp 
Added Files:
        stress1.cpp stress2.cpp writefile.cpp 
Removed Files:
        autogen.sh 
Log Message:
synced with the devel-1-0-x tree.






Index: .cvsignore
===================================================================
RCS file: /cvsroot/paragui/paragui/test/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** .cvsignore  15 Apr 2002 13:35:36 -0000      1.2
--- .cvsignore  18 Aug 2002 08:12:53 -0000      1.3
***************
*** 16,18 ****
  layouttest windowtest dropdown
  windowresize
! 
--- 16,20 ----
  layouttest windowtest dropdown
  windowresize
! listbox
! stress1
! stress2

Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/test/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.am 27 Jun 2002 14:37:12 -0000      1.9
--- Makefile.am 18 Aug 2002 08:12:53 -0000      1.10
***************
*** 1,5 ****
  AUTOMAKE_OPTIONS = foreign
  
! noinst_PROGRAMS = xmlloader factory listbox tabbar animation dropdown 
paratest dblbuffer navtest layouttest windowresize
  
  xmlloader_SOURCES = xmlloader.cpp
--- 1,7 ----
+ #SUBDIRS = keyboard fireworks colorselector
+ 
  AUTOMAKE_OPTIONS = foreign
  
! bin_PROGRAMS = writefile stress1 stress2 tabbar xmlloader listbox factory 
animation dropdown paratest dblbuffer navtest windowresize
  
  xmlloader_SOURCES = xmlloader.cpp
***************
*** 15,56 ****
  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
  
  EXTRA_DIST = \
        pokus.xml \
        icon.bmp
- 
- dist-hook:
-       rm -rf `find $(distdir) -type d -name CVS -print`
- 
- rpm: $(PACKAGE)-$(VERSION).tar.gz
-       cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-       rpm -ba $(PACKAGE).spec
  
  mlz: $(PACKAGE)-$(VERSION).tar.gz
--- 17,55 ----
  tabbar_LDADD = $(PARAGUI_LIBS)
  
+ writefile_SOURCES = writefile.cpp
+ writefile_LDADD = -L../src $(PARAGUI_LIBS)
+ 
+ stress1_SOURCES = stress1.cpp
+ stress1_LDADD = -L../src $(PARAGUI_LIBS)
+ 
+ stress2_SOURCES = stress2.cpp
+ stress2_LDADD = -L../src $(PARAGUI_LIBS)
+ 
  windowresize_SOURCES = windowresize.cpp
! windowresize_LDADD = -L../src $(PARAGUI_LIBS)
  
  dropdown_SOURCES = dropdown.cpp
! dropdown_LDADD = -L../src $(PARAGUI_LIBS)
  
  animation_SOURCES = animation.cpp
! animation_LDADD = -L../src $(PARAGUI_LIBS)
  
  dblbuffer_SOURCES = dblbuffer.cpp
! dblbuffer_LDADD = -L../src $(PARAGUI_LIBS)
  
  paratest_SOURCES = paratest.cpp
! paratest_LDADD = -L../src $(PARAGUI_LIBS)
  
  navtest_SOURCES = navtest.cpp
! navtest_LDADD = -L../src $(PARAGUI_LIBS)
  
! INCLUDES = $(PARAGUI_CFLAGS) -I$(top_srcdir)/include
  
  $(PACKAGE)-$(VERSION).tar.gz: dist
  
  EXTRA_DIST = \
+       dblbuffer.xml \
        pokus.xml \
        icon.bmp
  
  mlz: $(PACKAGE)-$(VERSION).tar.gz

Index: animation.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/animation.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** animation.cpp       25 Jun 2002 20:38:42 -0000      1.3
--- animation.cpp       18 Aug 2002 08:12:53 -0000      1.4
***************
*** 11,19 ****
  */
  
! #include <pgapplication.h>
! #include <pgpopupmenu.h> 
! #include <pgbutton.h>
! #include <pgmenubar.h> 
! #include <pgscrollbar.h> 
  
  #define ID_APP_EXIT           1
--- 11,21 ----
  */
  
! #include "pgapplication.h"
! #include "pgpopupmenu.h"
! #include "pgbutton.h"
! #include "pgmenubar.h"
! #include "pgscrollbar.h"
! #include "pgtimerobject.h"
! #include "pglog.h"
  
  #define ID_APP_EXIT           1
***************
*** 40,44 ****
  }
  
! class PlayField : public PG_ThemeWidget {
  public:
  
--- 42,46 ----
  }
  
! class PlayField : public PG_ThemeWidget, public PG_TimerObject {
  public:
  
***************
*** 49,53 ****
        ~PlayField();
  
!       void timer_callback(void);
  
  protected:
--- 51,55 ----
        ~PlayField();
  
!       Uint32 eventTimer(PG_TimerID id, Uint32 interval);
  
  protected:
***************
*** 113,134 ****
                        1
                        );
        }
        else if (tickstate == 1) {
                DrawHLine(0, my_height/2, my_width-1, my_color.r, my_color.g, 
my_color.b);
        }
  }
  
! void PlayField::timer_callback(void) {
! 
!       int prev_tickstate = tickstate;
! 
!       tickstate = (SDL_GetTicks()/1000)%3;
! 
!       if (tickstate != prev_tickstate) {
!               Update();
!       }
  }
  
! class PlayField2 : public PG_ThemeWidget
  {
  public:
--- 115,132 ----
                        1
                        );
+               tickstate = 1;
        }
        else if (tickstate == 1) {
                DrawHLine(0, my_height/2, my_width-1, my_color.r, my_color.g, 
my_color.b);
+               tickstate = 0;
        }
  }
  
! Uint32 PlayField::eventTimer(PG_TimerID id, Uint32 interval) {
!       Update();
!       PG_TimerObject::eventTimer(id, interval);
  }
  
! class PlayField2 : public PG_ThemeWidget, public PG_TimerObject
  {
  public:
***************
*** 140,144 ****
        ~PlayField2();
  
!       void timer_callback(void);
  
  protected:
--- 138,142 ----
        ~PlayField2();
  
!       Uint32 eventTimer(PG_TimerID id, Uint32 interval);
  
  protected:
***************
*** 211,233 ****
  }
  
! void PlayField2::timer_callback(void) {
! 
!       int prev_tickstate = tickstate;
! 
!       tickstate = (SDL_GetTicks()%1000)/25;
! 
!       if (tickstate != prev_tickstate) {
!               Update();
        }
- }
- 
- Uint32 timer_callback(Uint32 interval, void* parameter) {
-       ((PlayField2 *)parameter)->timer_callback();
-       return interval;
- }
  
! bool appidle_handler(PG_MessageObject* object, PG_Pointer* data) {
!       ((PlayField *)data)->timer_callback();
!       return true;
  }
  
--- 209,223 ----
  }
  
! Uint32 PlayField2::eventTimer(PG_TimerID id, Uint32 interval) {
!       tickstate++;
!       
!       PG_LogDBG("eventTimer(%i, %i)", id, interval);
!       
!       if(tickstate >= 40) {
!               tickstate = 0;
        }
  
!       Update();
!       PG_TimerObject::eventTimer(id, interval);
  }
  
***************
*** 310,315 ****
                );
  
!       // show me your .... lines ;-)
! 
        anim_test.Show();
  
--- 300,304 ----
                );
  
!       anim_test.AddTimer(400);
        anim_test.Show();
  
***************
*** 318,328 ****
          PG_Rect(260, 300, 120, 100)
          );
        anim_test2.Show();
- 
-       SDL_Init(SDL_INIT_TIMER);
-       SDL_AddTimer(20, timer_callback, (void *)&anim_test2);
- 
-       app.sigAppIdle.connect(slot(appidle_handler), &anim_test);
-       app.EnableAppIdleCalls();
  
        app.Run();
--- 307,314 ----
          PG_Rect(260, 300, 120, 100)
          );
+         
+       anim_test2.AddTimer(40);
+       anim_test2.AddTimer(20);
        anim_test2.Show();
  
        app.Run();

Index: dblbuffer.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/dblbuffer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dblbuffer.cpp       25 Jun 2002 20:38:42 -0000      1.5
--- dblbuffer.cpp       18 Aug 2002 08:12:53 -0000      1.6
***************
*** 36,43 ****
  int LoadSprite(SDL_Surface *screen, char *file)
  {
-       SDL_Surface *temp;
- 
        /* Load the sprite image */
!       sprite = SDL_LoadBMP(file);
        if ( sprite == NULL ) {
                PG_LogMSG( "Couldn't load %s: %s", file, SDL_GetError());
--- 36,41 ----
  int LoadSprite(SDL_Surface *screen, char *file)
  {
        /* Load the sprite image */
!       sprite = PG_FileArchive::LoadSurface(file, false);
        if ( sprite == NULL ) {
                PG_LogMSG( "Couldn't load %s: %s", file, SDL_GetError());
***************
*** 51,64 ****
        }
  
-       /* Convert sprite to video format */
-       temp = SDL_DisplayFormat(sprite);
-       SDL_FreeSurface(sprite);
-       if ( temp == NULL ) {
-               PG_LogMSG( "Couldn't convert background: %s",
-                                                       SDL_GetError());
-               return(-1);
-       }
-       sprite = temp;
- 
        /* We're ready to roll. :) */
        return(0);
--- 49,52 ----
***************
*** 72,75 ****
--- 60,65 ----
        nupdates = 0;
  
+       SDL_SetAlpha(sprite, 0, 0);
+ 
        /* Move the sprite, bounce at the wall, and draw */
        for ( i=0; i<numsprites; ++i ) {
***************
*** 191,194 ****
--- 181,186 ----
        }
  
+       PG_LogConsole::SetConsoleKey((SDLKey)0);
+       
        app.SetBulkMode(true);
        app.LoadTheme("default");
***************
*** 207,224 ****
        // get the label
        PG_Label* fps = static_cast<PG_Label*>(app.GetWidgetByName("fps"));
-       /*
-       if ( ! screen ) {
-               fprintf( "Couldn't set %dx%d video mode: %s",
-                                       width, height, SDL_GetError());
-               exit(2);
-       }
-       */
  
        screen = app.GetScreen();
  
-       /*
-       screen = SDL_SetVideoMode(width, height, video_bpp, videoflags);
-       */
- 
        /* Load the sprite */
        if ( LoadSprite(screen, "icon.bmp") < 0 ) {
--- 199,205 ----
***************
*** 229,233 ****
        mem = (Uint8 *)malloc(4*sizeof(SDL_Rect)*numsprites);
        if ( mem == NULL ) {
-               SDL_FreeSurface(sprite);
                PG_LogMSG("Out of memory!");
                exit(2);
--- 210,213 ----
***************
*** 289,314 ****
        done = 0;
        sprites_visible = 0;
        while ( !done ) {
                /* Check for events */
                ++frames;
                while ( SDL_PollEvent(&event) ) {
-                       /*
-                       switch (event.type) {
-                               case SDL_KEYDOWN:
-                                       // Any keypress quits the app...
-                               case SDL_QUIT:
-                                       done = 1;
-                                       break;
-                               default:
-                                       break;
-                       }
-                       */
                        app.PumpIntoEventQueue(&event);
                }
                now = SDL_GetTicks();
!               if ( now > then ) {
                                fps->SetTextFormat("%2.2f FPS",  
((double)frames*1000)/(now-then));
  
!                               if((now-then) > 2000) {
                                        then = now;
                                        frames=0;
--- 269,285 ----
        done = 0;
        sprites_visible = 0;
+ 
        while ( !done ) {
                /* Check for events */
                ++frames;
+ 
                while ( SDL_PollEvent(&event) ) {
                        app.PumpIntoEventQueue(&event);
                }
                now = SDL_GetTicks();
!               if ( now > then+1000 ) {
                                fps->SetTextFormat("%2.2f FPS",  
((double)frames*1000)/(now-then));
  
!                               if((now-then) > 1000) {
                                        then = now;
                                        frames=0;
***************
*** 329,341 ****
                        PG_Widget::BulkBlit();
                }
                /* Update the screen! */
!               if ( (screen->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF ) {
!                       SDL_Flip(screen);
!               } else {
!                       SDL_UpdateRect(screen, 0,0,0,0);
!                       //SDL_UpdateRects(screen, nupdates, sprite_rects);
!               }
        }
-       SDL_FreeSurface(sprite);
        free(mem);
  
--- 300,307 ----
                        PG_Widget::BulkBlit();
                }
+ 
                /* Update the screen! */
!               SDL_Flip(screen);
        }
        free(mem);
  

Index: layouttest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/layouttest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** layouttest.cpp      26 Jun 2002 08:03:53 -0000      1.2
--- layouttest.cpp      18 Aug 2002 08:12:53 -0000      1.3
***************
*** 1,5 ****
  #include "paragui.h"
- #include <iostream>
  #include "pgapplication.h"
  
  int main() {
--- 1,5 ----
  #include "paragui.h"
  #include "pgapplication.h"
+ #include "pgwindow.h"
  
  int main() {
***************
*** 17,22 ****
        }
  
!       app.LoadLayout("pokus.xml");
  
        // Enter main loop 
        app.Run();
--- 17,26 ----
        }
  
!       PG_Window wnd(NULL, PG_Rect(0,0,400,300), "Test");
!       wnd.LoadLayout("pokus.xml");
  
+       SDL_Delay(2000);
+       wnd.Show();
+       
        // Enter main loop 
        app.Run();

Index: list.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/list.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list.cpp    26 Jun 2002 16:00:21 -0000      1.3
--- list.cpp    18 Aug 2002 08:12:53 -0000      1.4
***************
*** 27,30 ****
--- 27,32 ----
        listbox.sigSelectItem.connect(slot(handleListBoxItem));
        
+       listbox.Show();
+ 
        new PG_ListBoxItem(&listbox, 25, "Item1");
        new PG_ListBoxItem(&listbox, 25, "Item2");
***************
*** 37,43 ****
        new PG_ListBoxItem(&listbox, 25, "Item9");
        new PG_ListBoxItem(&listbox, 25, "Item10");
- 
-       listbox.Show();
-       
  
        app.Run();
--- 39,42 ----

Index: paratest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/paratest.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** paratest.cpp        26 Jun 2002 16:00:21 -0000      1.12
--- paratest.cpp        18 Aug 2002 08:12:53 -0000      1.13
***************
*** 29,34 ****
  void Splash() {
      PG_ThemeWidget splash(NULL, PG_Rect(100,100,600,400), true);
      splash.Show();
!     SDL_Delay(1000);
      splash.Hide();
  }
--- 29,39 ----
  void Splash() {
      PG_ThemeWidget splash(NULL, PG_Rect(100,100,600,400), true);
+     PG_ThemeWidget splash1(&splash, PG_Rect(10,10,580,380));
+     PG_ThemeWidget splash2(&splash1, PG_Rect(10,10,560,340));
+     PG_Label l(&splash2, PG_Rect(10,10,540,320), "I'm a splash screen");
+     l.SetAlignment(PG_TA_CENTER);
+         
      splash.Show();
!     SDL_Delay(5000);
      splash.Hide();
  }
***************
*** 285,289 ****
        // construct the application object
        PG_Application& app = PG_Application::GetInstance();
!       
        for(int c=1; c<argc; c++) {
  
--- 290,294 ----
        // construct the application object
        PG_Application& app = PG_Application::GetInstance();
! 
        for(int c=1; c<argc; c++) {
  
***************
*** 299,303 ****
                        bTestMode = true;
                }
!               
                if(strcmp(argv[c], "-bpp") == 0) {
                        bpp = atoi(argv[++c]);
--- 304,313 ----
                        bTestMode = true;
                }
! 
!               if(strcmp(argv[c], "-hw") == 0) {
!                       flags |= SDL_HWSURFACE;
!                       flags ^= SDL_SWSURFACE;
!               }
! 
                if(strcmp(argv[c], "-bpp") == 0) {
                        bpp = atoi(argv[++c]);
***************
*** 331,334 ****
--- 341,346 ----
        app.SetCursor(app.GetTheme()->FindSurface("Pointer", "Pointer", 
"normal"));
  
+       //Splash();
+       
        SDL_Color color;
        color.r = 255;
***************
*** 351,360 ****
        wnd1.SetID(101);
        
-       //PG_Draw::DrawLine(0,0, app.GetScreenWidth()-1, 
app.GetScreenHeight()-1, color,1, app.GetScreen());
-       
        // create 2 radiobutton groups
        PG_RadioButton radio1(NULL, 1, PG_Rect(50,0,200,25), "RadioButton 1");
        PG_RadioButton radio2(NULL, 2, PG_Rect(50,25,200,25), "RadioButton 2", 
&radio1);
        PG_RadioButton radio3(NULL, 3, PG_Rect(50,50,200,25), "RadioButton 3", 
&radio1);
        
        PG_RadioButton radio4(NULL, 4, PG_Rect(50,90,200,25), "RadioButton 4");
--- 363,371 ----
        wnd1.SetID(101);
        
        // create 2 radiobutton groups
        PG_RadioButton radio1(NULL, 1, PG_Rect(50,0,200,25), "RadioButton 1");
        PG_RadioButton radio2(NULL, 2, PG_Rect(50,25,200,25), "RadioButton 2", 
&radio1);
        PG_RadioButton radio3(NULL, 3, PG_Rect(50,50,200,25), "RadioButton 3", 
&radio1);
+       radio1.SetAlignment(PG_TA_RIGHT);
        
        PG_RadioButton radio4(NULL, 4, PG_Rect(50,90,200,25), "RadioButton 4");
***************
*** 481,487 ****
            PG_LogMSG("'100' found by ID (name '%s')", tmp->GetName());
            
!       tmp = PG_Application::GetWidgetByName("WindowTwo");
!       if (tmp)
!           PG_LogMSG("'WindowTwo' found by name (id %d)", tmp->GetID());
            
        tmp = PG_Application::GetWidgetById(101);
--- 492,498 ----
            PG_LogMSG("'100' found by ID (name '%s')", tmp->GetName());
            
!       PG_Window* tempw = 
PG_Application::GetWidgetByName<PG_Window>("WindowTwo");
!       if (tempw)
!           PG_LogMSG("'WindowTwo' found by name (id %d)", tempw->GetID());
            
        tmp = PG_Application::GetWidgetById(101);

Index: pokus.xml
===================================================================
RCS file: /cvsroot/paragui/paragui/test/pokus.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pokus.xml   28 Jun 2002 10:33:50 -0000      1.3
--- pokus.xml   18 Aug 2002 08:12:53 -0000      1.4
***************
*** 26,30 ****
                </dropdown>
  
!               <label pos="300,50,200,30" text="Label" fsize="20" fstyle="7" 
indent="20" align="left" icon="icon.bmp"/>
                
                <image pos="300,90" iimage="icon.bmp"/>
--- 26,30 ----
                </dropdown>
  
!               <label pos="300,50,200,30" text="Label" fsize="10" fstyle="7" 
indent="20" align="left" icon="icon.bmp"/>
                
                <image pos="300,90" iimage="icon.bmp"/>
***************
*** 46,49 ****
--- 46,64 ----
                
                <widgetlist pos="250,500,100,90" scrollbar="1">
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
+                       <label pos="0,0,100,30" text="hepci !" align="left"/>
                        <label pos="0,0,100,30" text="hepci !" align="left"/>
                </widgetlist>

Index: windowtest.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/test/windowtest.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** windowtest.cpp      15 Apr 2002 13:22:29 -0000      1.1.1.1
--- windowtest.cpp      18 Aug 2002 08:12:53 -0000      1.2
***************
*** 13,17 ****
  };
  
! CMyWindow::CMyWindow(PG_Widget *parent,const PG_Rect& r,char *text,Uint32 
flags,const char* style = "Window") : PG_Window(parent,r,text,flags,style)
  
  {
--- 13,17 ----
  };
  
! CMyWindow::CMyWindow(PG_Widget *parent,const PG_Rect& r,char *text,Uint32 
flags,const char* style) : PG_Window(parent,r,text,flags,style)
  
  {
***************
*** 44,48 ****
        app=new PG_Application();
        app->SetEmergencyQuit(true);
!       app->LoadTheme("default");
        app->InitScreen(800,600,0,SDL_SWSURFACE);
  
--- 44,48 ----
        app=new PG_Application();
        app->SetEmergencyQuit(true);
!       app->LoadTheme("simple");
        app->InitScreen(800,600,0,SDL_SWSURFACE);
  
***************
*** 67,71 ****
        msgbox->Show();
        msgbox->WaitForClick();
! 
        // Get rid of mywidget, msgbox, and app buttons and context
        delete mywidget;
--- 67,74 ----
        msgbox->Show();
        msgbox->WaitForClick();
!       msgbox->Hide();
!       
!       app->Run();
!       
        // Get rid of mywidget, msgbox, and app buttons and context
        delete mywidget;
***************
*** 75,79 ****
  
        // Start the process over exactly the same
!       // Crash happens here in physfs.c
        app=new PG_Application();
        app->SetEmergencyQuit(true);
--- 78,82 ----
  
        // Start the process over exactly the same
! 
        app=new PG_Application();
        app->SetEmergencyQuit(true);

--- autogen.sh DELETED ---





reply via email to

[Prev in Thread] Current Thread [Next in Thread]