paragui-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paragui-cvs] CVS: paragui/include pgsingleton.h,NONE,1.1.2.1 Makefile.a

From: Teunis Peters <address@hidden>
Subject: [paragui-cvs] CVS: paragui/include pgsingleton.h,NONE,1.1.2.1 Makefile.am,1.6,1.6.2.1 paraconfig.h,1.4,1.4.2.1 paragui.h,1.5.2.1,1.5.2.2 paragui_types.h,1.5.2.1,1.5.2.2 pgapplication.h,1.11.2.1,1.11.2.2 pgcolors.h,1.3,1.3.2.1 pgdraw.h,1.4.2.1,1.4.2.2 pglog.h,1.3.2.1,1.3.2.2 pgpoint.h,1.1.2.1,1.1.2.2 pgsignals.h,1.7.2.1,1.7.2.2
Date: Tue, 25 Jun 2002 23:25:07 -0400 
Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv31265/include

Modified Files:
      Tag: devel-opengl
        Makefile.am paraconfig.h paragui.h paragui_types.h 
        pgapplication.h pgcolors.h pgdraw.h pglog.h pgpoint.h 
        pgsignals.h 
Added Files:
      Tag: devel-opengl
        pgsingleton.h 
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 :)


--- NEW FILE ---
#ifndef PG_SINGLETON_H
#define PG_SINGLETON_H

template< class T > class PG_Singleton {
public:
        static T& GetInstance() {
                static T obj;
                return obj;
        }

protected:
        PG_Singleton() {};
        ~PG_Singleton() {};

private:
        PG_Singleton(const T&) {};
        T& operator=(const T&) {};
        
};

#endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/include/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** Makefile.am 29 Apr 2002 11:44:21 -0000      1.6
--- Makefile.am 26 Jun 2002 03:25:03 -0000      1.6.2.1
***************
*** 53,57 ****
        pgtabbar.h \
        pgnotebook.h \
!       pgfilelist.h
  
  EXTRA_DIST = \
--- 53,58 ----
        pgtabbar.h \
        pgnotebook.h \
!       pgfilelist.h \
!       pgsingleton.h
  
  EXTRA_DIST = \

Index: paraconfig.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** paraconfig.h        27 Apr 2002 15:36:54 -0000      1.4
--- paraconfig.h        26 Jun 2002 03:25:03 -0000      1.4.2.1
***************
*** 33,36 ****
--- 33,38 ----
  #undef VERSION
  
+ #define PG_VERSIONNUM(X, Y, Z) ((X)*10000 + (Y)*100 + (Z))
+ 
  #if (defined(WIN32) || defined(__WIN32__)) && (defined(_MSC_VER) || 
defined(__BCPLUSPLUS__))
  #include "paraconfig_win32.h"
***************
*** 71,75 ****
--- 73,81 ----
  #define HASH_MAP_INC <ext/hash_map>
  #define MAP_INC <ext/hash_map>
+ #if PG_VERSIONNUM(__GNUC__, __GNUC_MINOR__, 0) >= PG_VERSIONNUM(3, 1, 0)
+ #define STL_MAP __gnu_cxx::hash_map
+ #else
  #define STL_MAP std::hash_map
+ #endif
  #else
  #define MAP_INC <map>

Index: paragui.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paragui.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** paragui.h   18 Jun 2002 22:40:38 -0000      1.5.2.1
--- paragui.h   26 Jun 2002 03:25:03 -0000      1.5.2.2
***************
*** 43,47 ****
  
  // SDL
! #include "glSDL.h"
  #include "SDL_thread.h"
  
--- 43,47 ----
  
  // SDL
! #include "SDL.h"
  #include "SDL_thread.h"
  

Index: paragui_types.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paragui_types.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** paragui_types.h     18 Jun 2002 22:40:38 -0000      1.5.2.1
--- paragui_types.h     26 Jun 2002 03:25:03 -0000      1.5.2.2
***************
*** 35,39 ****
  #define PARAGUI_TYPES_H
  
! #include "glSDL.h"
  
  //! Structure for widget gradients
--- 35,39 ----
  #define PARAGUI_TYPES_H
  
! #include "SDL.h"
  
  //! Structure for widget gradients

Index: pgapplication.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgapplication.h,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** pgapplication.h     18 Jun 2002 22:40:38 -0000      1.11.2.1
--- pgapplication.h     26 Jun 2002 03:25:03 -0000      1.11.2.2
***************
*** 38,41 ****
--- 38,42 ----
  #include "pgfilearchive.h"
  #include "pgfont.h"
+ #include "pgsingleton.h"
  
  class PG_Theme;
***************
*** 93,99 ****
  */
  
! class DECLSPEC PG_Application : public PG_MessageObject, public 
PG_FileArchive, public PG_FontEngine  {
! public:
  
        /**  */
        PG_Application();
--- 94,100 ----
  */
  
! class DECLSPEC PG_Application : public PG_MessageObject, public 
PG_FileArchive, public PG_FontEngine, public PG_Singleton<PG_Application>  {
  
+ protected:
        /**  */
        PG_Application();
***************
*** 102,105 ****
--- 103,108 ----
        ~PG_Application();
  
+ public:
+ 
        /**
        Initialize the screen
***************
*** 584,588 ****
        static PG_Theme* my_Theme;
        static std::string app_path;
!       static PG_Application* pGlobalApp;
        static PG_Draw::PG_DrawableSurface* screen;
  
--- 587,591 ----
        static PG_Theme* my_Theme;
        static std::string app_path;
!         //static PG_Application* pGlobalApp;
        static PG_Draw::PG_DrawableSurface* screen;
  
***************
*** 600,603 ****
--- 603,607 ----
        static PG_Widget* lastwidget;
          static PG_Draw::PG_Draw* drawable;
+       friend class PG_Singleton<PG_Application>;
  };
  

Index: pgcolors.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcolors.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** pgcolors.h  15 Apr 2002 13:35:35 -0000      1.3
--- pgcolors.h  26 Jun 2002 03:25:03 -0000      1.3.2.1
***************
*** 556,562 ****
  const SDL_Color VioletRed2 = {238, 58, 140};
  const SDL_Color violetred2 = {238, 58, 140};
! #ifndef __BORLANDC__
! const SDL_Color tan = {210, 180, 140};
! #endif
  const SDL_Color SeaGreen2 = {78, 238, 148};
  const SDL_Color seagreen2 = {78, 238, 148};
--- 556,560 ----
  const SDL_Color VioletRed2 = {238, 58, 140};
  const SDL_Color violetred2 = {238, 58, 140};
! const SDL_Color tan1 = {210, 180, 140};
  const SDL_Color SeaGreen2 = {78, 238, 148};
  const SDL_Color seagreen2 = {78, 238, 148};

Index: pgdraw.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgdraw.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pgdraw.h    18 Jun 2002 22:40:38 -0000      1.4.2.1
--- pgdraw.h    26 Jun 2002 03:25:03 -0000      1.4.2.2
***************
*** 225,228 ****
--- 225,229 ----
      public:
        static PG_Draw* GetDefaultDrawable();
+       static PG_Draw* SetDefaultDrawable(PG_Draw* draw);
        PG_Draw();
        virtual ~PG_Draw();

Index: pglog.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglog.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** pglog.h     18 Jun 2002 22:40:38 -0000      1.3.2.1
--- pglog.h     26 Jun 2002 03:25:03 -0000      1.3.2.2
***************
*** 37,41 ****
  
  #include <stdarg.h>
! #include "glSDL.h"
  
  //! ParaGUI logging level
--- 37,41 ----
  
  #include <stdarg.h>
! #include "SDL.h"
  
  //! ParaGUI logging level

Index: pgpoint.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgpoint.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pgpoint.h   18 Jun 2002 22:40:38 -0000      1.1.2.1
--- pgpoint.h   26 Jun 2002 03:25:03 -0000      1.1.2.2
***************
*** 2,6 ****
  #define PG_POINT_H
  
! #include "glSDL.h"
  
  class PG_Point {
--- 2,6 ----
  #define PG_POINT_H
  
! #include "SDL.h"
  
  class PG_Point {

Index: pgsignals.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgsignals.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** pgsignals.h 18 Jun 2002 22:40:38 -0000      1.7.2.1
--- pgsignals.h 26 Jun 2002 03:25:03 -0000      1.7.2.2
***************
*** 30,34 ****
  #define PG_SIGNALS_H
  
! #include "glSDL.h"
  #include <sigc++/sigc++.h>
  
--- 30,34 ----
  #define PG_SIGNALS_H
  
! #include "SDL.h"
  #include <sigc++/sigc++.h>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]