[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/include paraconfig.h,1.3.6.11,1.3.6.12 paraco
|
From: |
Alexander Pipelka <address@hidden> |
|
Subject: |
[paragui-cvs] CVS: paragui/include paraconfig.h,1.3.6.11,1.3.6.12 paraconfig_macos.h,1.1.2.3,1.1.2.4 paraconfig_win32.h,1.1.1.1.6.5,1.1.1.1.6.6 paragui.h,1.3.6.3,1.3.6.4 pgapplication.h,1.3.6.4,1.3.6.5 pgcolumnitem.h,1.3,1.3.6.1 pgfile.h,1.3.6.3,1.3.6.4 pgfilearchive.h,1.3.6.4,1.3.6.5 pgfont.h,1.3.6.1,1.3.6.2 pglineedit.h,1.3,1.3.6.1 pgmaskedit.h,1.3,1.3.6.1 pgmenubar.h,1.3.6.1,1.3.6.2 pgmessageobject.h,1.3.6.2,1.3.6.3 pgnavigator.h,1.3,1.3.6.1 pgnotebook.h,1.3.6.1,1.3.6.2 pgpopupmenu.h,1.3.6.2,1.3.6.3 pgrectlist.h,1.3.6.1,1.3.6.2 pgrichedit.h,1.3.6.1,1.3.6.2 pgsurfacecache.h,1.3,1.3.6.1 pgtimerobject.h,1.1.2.5,1.1.2.6 pgwidget.h,1.3,1.3.6.1 pgwidgetlist.h,1.3,1.3.6.1 |
|
Date: |
Sat, 04 Jan 2003 16:13:42 -0500 |
Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv24897/include
Modified Files:
Tag: devel-1-0
paraconfig.h paraconfig_macos.h paraconfig_win32.h paragui.h
pgapplication.h pgcolumnitem.h pgfile.h pgfilearchive.h
pgfont.h pglineedit.h pgmaskedit.h pgmenubar.h
pgmessageobject.h pgnavigator.h pgnotebook.h pgpopupmenu.h
pgrectlist.h pgrichedit.h pgsurfacecache.h pgtimerobject.h
pgwidget.h pgwidgetlist.h
Log Message:
- kicked version to 1.0.4
- added "using namespace std;" to paraconfig.h
- removed all std:: prefixes
- removed std:: hacks for gcc, mwerks compilers (no longer needed due to
default namespace std)
Index: paraconfig.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig.h,v
retrieving revision 1.3.6.11
retrieving revision 1.3.6.12
diff -C2 -r1.3.6.11 -r1.3.6.12
*** paraconfig.h 1 Nov 2002 20:24:57 -0000 1.3.6.11
--- paraconfig.h 4 Jan 2003 21:13:37 -0000 1.3.6.12
***************
*** 35,69 ****
#define PG_VERSIONNUM(X, Y, Z) ((X)*10000 + (Y)*100 + (Z))
- //stuff needed for MWERKS Codewarrior (7+)
- //this is before the OS specific stuff as strdup_macos.h needs some of these
defined
- #ifdef __MWERKS__
- using std::abs;
- using std::malloc;
- using std::free;
- using std::memset;
- using std::fabs;
- using std::sin;
- using std::cos;
- using std::ceil;
- using std::memcpy;
- using std::calloc;
- using std::floor;
- using std::exit;
- using std::atexit;
- using std::getenv;
- using std::sqrt;
- using std::strcpy;
- using std::strcmp;
- using std::strchr;
- using std::strlen;
- using std::strcat;
- using std::strncpy;
- using std::atoi;
- using std::strtok;
- using std::time_t;
- using std::localtime;
- using std::time;
- #endif
-
#if (defined(WIN32) || defined(__WIN32__)) && (defined(__MINGW32__) ||
defined(_MSC_VER) || defined(__BCPLUSPLUS__) || defined(__MWERKS__))
#include "paraconfig_win32.h"
--- 35,38 ----
***************
*** 72,108 ****
#else // GNU
#include "paraconfig_gnu.h"
-
- // For C++ compliance (required with gcc 3.0)
- #ifndef SWIG
- using std::cerr;
- using std::cout;
- using std::endl;
- using std::ios;
- #ifndef _STLPORT_VERSION
- using std::strcpy;
- using std::strcmp;
- using std::strchr;
- using std::strlen;
- using std::strcat;
- using std::strncpy;
- #endif // _STLPORT_VERSION
- #endif // SWIG
#endif // GNU
! // Some stuff needed for Win32
! #ifdef WIN32
! #define WIN32_LEAN_AND_MEAN
! #define VC_EXTRALEAN
! #include<windows.h>
! extern int SDL_RegisterApp(char*, Uint32, void*);
! #undef SendMessage
! #endif // WIN32
!
! // STL std::map / std::hash_map
#if defined(HAVE_HASH_MAP)
#define HASH_MAP_INC <hash_map>
#define MAP_INC <hash_map>
! #define STL_MAP std::hash_map
#elif defined(HAVE_EXT_HASH_MAP)
#define HASH_MAP_INC <ext/hash_map>
--- 41,52 ----
#else // GNU
#include "paraconfig_gnu.h"
#endif // GNU
! // STL map / hash_map
#if defined(HAVE_HASH_MAP)
#define HASH_MAP_INC <hash_map>
#define MAP_INC <hash_map>
! #define STL_MAP hash_map
#elif defined(HAVE_EXT_HASH_MAP)
#define HASH_MAP_INC <ext/hash_map>
***************
*** 111,119 ****
#define STL_MAP __gnu_cxx::hash_map
#else
! #define STL_MAP std::hash_map
#endif
#else
#define MAP_INC <map>
! #define STL_MAP std::map
#endif
--- 55,63 ----
#define STL_MAP __gnu_cxx::hash_map
#else
! #define STL_MAP hash_map
#endif
#else
#define MAP_INC <map>
! #define STL_MAP map
#endif
Index: paraconfig_macos.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig_macos.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** paraconfig_macos.h 20 Jun 2002 14:38:00 -0000 1.1.2.3
--- paraconfig_macos.h 4 Jan 2003 21:13:37 -0000 1.1.2.4
***************
*** 51,55 ****
/* Version number of package */
! #define VERSION "1.0.3"
#endif
--- 51,55 ----
/* Version number of package */
! #define VERSION "1.0.4"
#endif
Index: paraconfig_win32.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig_win32.h,v
retrieving revision 1.1.1.1.6.5
retrieving revision 1.1.1.1.6.6
diff -C2 -r1.1.1.1.6.5 -r1.1.1.1.6.6
*** paraconfig_win32.h 1 Nov 2002 20:24:57 -0000 1.1.1.1.6.5
--- paraconfig_win32.h 4 Jan 2003 21:13:37 -0000 1.1.1.1.6.6
***************
*** 51,55 ****
/* Version number of package */
! #define VERSION "1.0.3"
#endif // WIN32_CONFIG_INCLUDED
--- 51,64 ----
/* Version number of package */
! #define VERSION "1.0.4"
!
! // Some stuff needed for Win32
! #ifdef WIN32
! #define WIN32_LEAN_AND_MEAN
! #define VC_EXTRALEAN
! #include <windows.h>
! extern int SDL_RegisterApp(char*, Uint32, void*);
! #undef SendMessage
! #endif // WIN32
#endif // WIN32_CONFIG_INCLUDED
Index: paragui.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paragui.h,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -C2 -r1.3.6.3 -r1.3.6.4
*** paragui.h 1 Nov 2002 15:00:59 -0000 1.3.6.3
--- paragui.h 4 Jan 2003 21:13:37 -0000 1.3.6.4
***************
*** 87,97 ****
#include <iostream>
#include <cstring>
#endif
! #include "paraconfig.h"
! #ifndef SWIG
! #include <string>
! #endif
// mpatrol
--- 87,97 ----
#include <iostream>
#include <cstring>
+ #include <string>
#endif
! //our default namespace is std
! using namespace std;
! #include "paraconfig.h"
// mpatrol
Index: pgapplication.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgapplication.h,v
retrieving revision 1.3.6.4
retrieving revision 1.3.6.5
diff -C2 -r1.3.6.4 -r1.3.6.5
*** pgapplication.h 22 Nov 2002 17:58:43 -0000 1.3.6.4
--- pgapplication.h 4 Jan 2003 21:13:37 -0000 1.3.6.5
***************
*** 557,561 ****
#ifndef SWIG
! static std::string app_path;
#endif
--- 557,561 ----
#ifndef SWIG
! static string app_path;
#endif
Index: pgcolumnitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcolumnitem.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgcolumnitem.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgcolumnitem.h 4 Jan 2003 21:13:37 -0000 1.3.6.1
***************
*** 112,117 ****
#ifndef SWIG
! std::vector <Uint32> my_columnwidth;
! std::vector <std::string> my_columntext;
#endif
};
--- 112,117 ----
#ifndef SWIG
! vector <Uint32> my_columnwidth;
! vector <string> my_columntext;
#endif
};
Index: pgfile.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfile.h,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -C2 -r1.3.6.3 -r1.3.6.4
*** pgfile.h 10 Jul 2002 19:12:49 -0000 1.3.6.3
--- pgfile.h 4 Jan 2003 21:13:37 -0000 1.3.6.4
***************
*** 91,95 ****
\return number of bytes written
*/
! int write(std::string &buffer);
#endif
--- 91,95 ----
\return number of bytes written
*/
! int write(string &buffer);
#endif
***************
*** 161,165 ****
Any trailing carriage return and linefeed characters will be skipped.
*/
! std::string getline();
/**
--- 161,165 ----
Any trailing carriage return and linefeed characters will be skipped.
*/
! string getline();
/**
***************
*** 169,173 ****
characters will be added.
*/
! void putline(const std::string& line);
private:
--- 169,173 ----
characters will be added.
*/
! void putline(const string& line);
private:
Index: pgfilearchive.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfilearchive.h,v
retrieving revision 1.3.6.4
retrieving revision 1.3.6.5
diff -C2 -r1.3.6.4 -r1.3.6.5
*** pgfilearchive.h 17 Aug 2002 21:39:04 -0000 1.3.6.4
--- pgfilearchive.h 4 Jan 2003 21:13:37 -0000 1.3.6.5
***************
*** 59,63 ****
//! PG_FileList type (vector of strings)
! typedef std::vector< std::string > PG_FileList;
/**
--- 59,63 ----
//! PG_FileList type (vector of strings)
! typedef vector< string > PG_FileList;
/**
***************
*** 177,181 ****
\return a string with the converted path
*/
! static std::string *PathToPlatform(const char *path);
//! Get the application base directory
--- 177,181 ----
\return a string with the converted path
*/
! static string *PathToPlatform(const char *path);
//! Get the application base directory
Index: pgfont.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfont.h,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgfont.h 10 Jun 2002 13:17:17 -0000 1.3.6.1
--- pgfont.h 4 Jan 2003 21:13:37 -0000 1.3.6.2
***************
*** 225,229 ****
#ifndef SWIG
! typedef std::map<FT_F26Dot6, PG_FontFaceCacheItem*> MAP_SUBITEMS;
class FONT_ITEM {
--- 225,229 ----
#ifndef SWIG
! typedef map<FT_F26Dot6, PG_FontFaceCacheItem*> MAP_SUBITEMS;
class FONT_ITEM {
***************
*** 234,243 ****
virtual ~FONT_ITEM();
! std::string name;
PG_DataContainer* memdata;
MAP_SUBITEMS subitems;
};
! typedef std::map<std::string, FONT_ITEM*> MAP_FONTS;
static MAP_FONTS my_fontcache;
--- 234,243 ----
virtual ~FONT_ITEM();
! string name;
PG_DataContainer* memdata;
MAP_SUBITEMS subitems;
};
! typedef map<string, FONT_ITEM*> MAP_FONTS;
static MAP_FONTS my_fontcache;
Index: pglineedit.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglineedit.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pglineedit.h 15 Apr 2002 13:35:35 -0000 1.3
--- pglineedit.h 4 Jan 2003 21:13:37 -0000 1.3.6.1
***************
*** 201,205 ****
bool IsValidKey(char c);
! std::string my_buffer;
int my_startMark;
int my_endMark;
--- 201,205 ----
bool IsValidKey(char c);
! string my_buffer;
int my_startMark;
int my_endMark;
***************
*** 207,211 ****
bool my_isCursorVisible;
int my_offsetX;
! std::string my_validkeys;
bool my_isEditable;
int my_maximumLength;
--- 207,211 ----
bool my_isCursorVisible;
int my_offsetX;
! string my_validkeys;
bool my_isEditable;
int my_maximumLength;
Index: pgmaskedit.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmaskedit.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgmaskedit.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgmaskedit.h 4 Jan 2003 21:13:37 -0000 1.3.6.1
***************
*** 91,97 ****
#ifndef SWIG
!
! std::string my_mask;
! std::string my_displaymask;
#endif
--- 91,96 ----
#ifndef SWIG
! string my_mask;
! string my_displaymask;
#endif
Index: pgmenubar.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmenubar.h,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgmenubar.h 1 Nov 2002 15:00:59 -0000 1.3.6.1
--- pgmenubar.h 4 Jan 2003 21:13:37 -0000 1.3.6.2
***************
*** 86,90 ****
} MenuBarItem;
! std::vector<MenuBarItem*> ItemList;
Uint16 my_btnOffsetY;
--- 86,90 ----
} MenuBarItem;
! vector<MenuBarItem*> ItemList;
Uint16 my_btnOffsetY;
***************
*** 99,103 ****
void Cleanup();
! std::string my_style;
PG_PopupMenu* my_active;
--- 99,103 ----
void Cleanup();
! string my_style;
PG_PopupMenu* my_active;
Index: pgmessageobject.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmessageobject.h,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -C2 -r1.3.6.2 -r1.3.6.3
*** pgmessageobject.h 1 Nov 2002 15:00:59 -0000 1.3.6.2
--- pgmessageobject.h 4 Jan 2003 21:13:37 -0000 1.3.6.3
***************
*** 303,307 ****
#ifndef SWIG
! static std::vector<PG_MessageObject*> objectList;
#endif
--- 303,307 ----
#ifndef SWIG
! static vector<PG_MessageObject*> objectList;
#endif
Index: pgnavigator.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgnavigator.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgnavigator.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgnavigator.h 4 Jan 2003 21:13:38 -0000 1.3.6.1
***************
*** 40,44 ****
*/
! class PG_Navigator : protected std::vector<PG_Widget*> {
public:
--- 40,44 ----
*/
! class PG_Navigator : protected vector<PG_Widget*> {
public:
Index: pgnotebook.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgnotebook.h,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgnotebook.h 1 Nov 2002 15:00:59 -0000 1.3.6.1
--- pgnotebook.h 4 Jan 2003 21:13:38 -0000 1.3.6.2
***************
*** 108,112 ****
};
! typedef std::list<PG_NotebookPageCallback> cblist;
class DECLSPEC PG_NotebookPage : public PG_Widget
--- 108,112 ----
};
! typedef list<PG_NotebookPageCallback> cblist;
class DECLSPEC PG_NotebookPage : public PG_Widget
***************
*** 218,222 ****
}
! const std::string& GetTitle() {
return my_title;
}
--- 218,222 ----
}
! const string& GetTitle() {
return my_title;
}
***************
*** 235,239 ****
cblist help_callbacks;
! std::string my_title;
Uint32 my_page_id;
--- 235,239 ----
cblist help_callbacks;
! string my_title;
Uint32 my_page_id;
***************
*** 280,284 ****
protected:
! std::vector<PG_NotebookPage*> my_tab_pages;
private:
--- 280,284 ----
protected:
! vector<PG_NotebookPage*> my_tab_pages;
private:
***************
*** 382,387 ****
return *this;
! std::vector<PG_NotebookPage*>::iterator it = my_pages.begin();
! std::vector<PG_NotebookPage*>::iterator end = my_pages.end();
while(it != end) {
--- 382,387 ----
return *this;
! vector<PG_NotebookPage*>::iterator it = my_pages.begin();
! vector<PG_NotebookPage*>::iterator end = my_pages.end();
while(it != end) {
***************
*** 576,580 ****
bool widgetValid;
! std::vector<PG_NotebookPage*> my_pages;
STL_MAP<Uint32, PG_NotebookPage*> my_page_ids;
};
--- 576,580 ----
bool widgetValid;
! vector<PG_NotebookPage*> my_pages;
STL_MAP<Uint32, PG_NotebookPage*> my_page_ids;
};
Index: pgpopupmenu.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgpopupmenu.h,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -C2 -r1.3.6.2 -r1.3.6.3
*** pgpopupmenu.h 18 Jun 2002 08:10:23 -0000 1.3.6.2
--- pgpopupmenu.h 4 Jan 2003 21:13:38 -0000 1.3.6.3
***************
*** 137,141 ****
inline PG_PopupMenu *getSubMenu() const;
! inline const std::string& getCaption() const;
inline operator PG_Point const&() const;
--- 137,141 ----
inline PG_PopupMenu *getSubMenu() const;
! inline const string& getCaption() const;
inline operator PG_Point const&() const;
***************
*** 148,152 ****
protected: // data
unsigned myFlags;
! std::string myCaption;
PG_PopupMenu *myParent;
--- 148,152 ----
protected: // data
unsigned myFlags;
! string myCaption;
PG_PopupMenu *myParent;
***************
*** 167,171 ****
#ifndef DOXYGEN_SKIP
! class item_with_id : public std::unary_function<MenuItem*, bool> {
int id;
--- 167,171 ----
#ifndef DOXYGEN_SKIP
! class item_with_id : public unary_function<MenuItem*, bool> {
int id;
***************
*** 274,278 ****
#ifndef SWIG
! typedef std::list<MenuItem*>::iterator MII;
#endif // SWIG
--- 274,278 ----
#ifndef SWIG
! typedef list<MenuItem*>::iterator MII;
#endif // SWIG
***************
*** 311,316 ****
protected: // data
#ifndef SWIG
! std::list<MenuItem*> items; /** the menu items collection */
! std::string myCaption; /** menu caption */
#endif //SWIG
--- 311,316 ----
protected: // data
#ifndef SWIG
! list<MenuItem*> items; /** the menu items collection */
! string myCaption; /** menu caption */
#endif //SWIG
***************
*** 432,436 ****
}
! inline const std::string& PG_PopupMenu::MenuItem::getCaption() const {
return myCaption;
}
--- 432,436 ----
}
! inline const string& PG_PopupMenu::MenuItem::getCaption() const {
return myCaption;
}
Index: pgrectlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrectlist.h,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgrectlist.h 29 May 2002 22:11:45 -0000 1.3.6.1
--- pgrectlist.h 4 Jan 2003 21:13:38 -0000 1.3.6.2
***************
*** 44,48 ****
*/
! class DECLSPEC PG_RectList : public std::vector<PG_Widget*> {
public:
--- 44,48 ----
*/
! class DECLSPEC PG_RectList : public vector<PG_Widget*> {
public:
***************
*** 155,159 ****
};
! typedef std::map<PG_Rect*, int, rectlist_cmp> PG_RectListMap;
#endif
--- 155,159 ----
};
! typedef map<PG_Rect*, int, rectlist_cmp> PG_RectListMap;
#endif
Index: pgrichedit.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrichedit.h,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgrichedit.h 28 May 2002 12:37:31 -0000 1.3.6.1
--- pgrichedit.h 4 Jan 2003 21:13:38 -0000 1.3.6.2
***************
*** 58,62 ****
@param text rich text to set
*/
! void SetText(const std::string &text);
/**
--- 58,62 ----
@param text rich text to set
*/
! void SetText(const string &text);
/**
***************
*** 92,96 ****
struct RichWordDescription {
! std::string my_Word;
Uint32 my_Width;
Uint32 my_EndSpaceWidth;
--- 92,96 ----
struct RichWordDescription {
! string my_Word;
Uint32 my_Width;
Uint32 my_EndSpaceWidth;
***************
*** 102,110 ****
};
! typedef std::vector<RichWordDescription> RichWordDescriptionArray;
RichWordDescriptionArray my_ParsedWords;
! typedef std::vector<size_t> Size_tArray;
struct RichLinePart {
--- 102,110 ----
};
! typedef vector<RichWordDescription> RichWordDescriptionArray;
RichWordDescriptionArray my_ParsedWords;
! typedef vector<size_t> Size_tArray;
struct RichLinePart {
***************
*** 130,134 ****
};
! typedef std::vector<RichLinePart> RichLinePartArray;
struct RichLine {
--- 130,134 ----
};
! typedef vector<RichLinePart> RichLinePartArray;
struct RichLine {
***************
*** 142,146 ****
};
! typedef std::vector<RichLine> RichLineArray;
RichLineArray my_RichText;
--- 142,146 ----
};
! typedef vector<RichLine> RichLineArray;
RichLineArray my_RichText;
***************
*** 163,169 ****
Uint32 my_Align;
! std::string my_ActualFontName;
! typedef std::map<Sint32, PG_Widget*> WidgetMap;
Sint32 CompleteLines();
--- 163,169 ----
Uint32 my_Align;
! string my_ActualFontName;
! typedef map<Sint32, PG_Widget*> WidgetMap;
Sint32 CompleteLines();
***************
*** 171,176 ****
Sint32 CompleteLinePart(size_t searchFrom, Sint32 lineTop, Uint32
&lineSpace, RichLineArray::iterator actualLine, RichLinePartArray::iterator
actualLinePart, bool &breakLine, Uint32 &lineAscent, bool changeAlign);
void GetWidgetsOnLine(Sint32 lineTop, Uint32 lineHeight, WidgetMap
&widgetsOnLine, bool clear);
! bool ProcessLongLine(std::string &word, size_t &searchFrom, Uint32
oldFind, Sint32 lineTop, Uint32 &lineSpace, bool normalLine,
RichLineArray::iterator actualLine, RichLinePartArray::iterator actualLinePart,
Uint32 &lineAscent);
! size_t GetWord(size_t searchFrom, std::string *word, Uint32 *endMark);
void AlignLinePart(RichLinePartArray::iterator actualLinePart, Uint32
align, bool breakLine);
void AlignLine(RichLineArray::iterator actualLine, WidgetMap
&widgetsOnLine, Uint32 align);
--- 171,176 ----
Sint32 CompleteLinePart(size_t searchFrom, Sint32 lineTop, Uint32
&lineSpace, RichLineArray::iterator actualLine, RichLinePartArray::iterator
actualLinePart, bool &breakLine, Uint32 &lineAscent, bool changeAlign);
void GetWidgetsOnLine(Sint32 lineTop, Uint32 lineHeight, WidgetMap
&widgetsOnLine, bool clear);
! bool ProcessLongLine(string &word, size_t &searchFrom, Uint32 oldFind,
Sint32 lineTop, Uint32 &lineSpace, bool normalLine, RichLineArray::iterator
actualLine, RichLinePartArray::iterator actualLinePart, Uint32 &lineAscent);
! size_t GetWord(size_t searchFrom, string *word, Uint32 *endMark);
void AlignLinePart(RichLinePartArray::iterator actualLinePart, Uint32
align, bool breakLine);
void AlignLine(RichLineArray::iterator actualLine, WidgetMap
&widgetsOnLine, Uint32 align);
Index: pgsurfacecache.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgsurfacecache.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgsurfacecache.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgsurfacecache.h 4 Jan 2003 21:13:38 -0000 1.3.6.1
***************
*** 35,39 ****
int refcount;
SDL_Surface* surface;
! std::string key;
}
pg_surface_cache_t;
--- 35,39 ----
int refcount;
SDL_Surface* surface;
! string key;
}
pg_surface_cache_t;
***************
*** 45,56 ****
virtual ~PG_SurfaceCache();
! void CreateKey(std::string &key, Uint16 w, Uint16 h,
PG_Gradient* gradient, SDL_Surface* background,
Sint8 bkmode, Uint8 blend);
! SDL_Surface* FindSurface(const std::string &key);
! SDL_Surface* AddSurface(const std::string &key, SDL_Surface* surface);
void DeleteSurface(SDL_Surface* surface, bool bDeleteIfNotExists =
true);
! void IncRef(const std::string &key);
void Cleanup();
--- 45,56 ----
virtual ~PG_SurfaceCache();
! void CreateKey(string &key, Uint16 w, Uint16 h,
PG_Gradient* gradient, SDL_Surface* background,
Sint8 bkmode, Uint8 blend);
! SDL_Surface* FindSurface(const string &key);
! SDL_Surface* AddSurface(const string &key, SDL_Surface* surface);
void DeleteSurface(SDL_Surface* surface, bool bDeleteIfNotExists =
true);
! void IncRef(const string &key);
void Cleanup();
***************
*** 58,62 ****
private:
! pg_surface_cache_t* FindByKey(const std::string &key);
pg_surface_cache_t* FindBySurface(SDL_Surface* surface);
--- 58,62 ----
private:
! pg_surface_cache_t* FindByKey(const string &key);
pg_surface_cache_t* FindBySurface(SDL_Surface* surface);
Index: pgtimerobject.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgtimerobject.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** pgtimerobject.h 31 May 2002 09:09:55 -0000 1.1.2.5
--- pgtimerobject.h 4 Jan 2003 21:13:38 -0000 1.1.2.6
***************
*** 96,104 ****
static PG_TimerID globalTimerID;
! static std::map<PG_TimerID, PG_TimerObject*> timermap;
static Uint32 objectcount;
static PG_TimerObject* objSingleTimer;
! std::map<PG_TimerID, SDL_TimerID> my_timermap;
};
--- 96,104 ----
static PG_TimerID globalTimerID;
! static map<PG_TimerID, PG_TimerObject*> timermap;
static Uint32 objectcount;
static PG_TimerObject* objSingleTimer;
! map<PG_TimerID, SDL_TimerID> my_timermap;
};
Index: pgwidget.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidget.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgwidget.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgwidget.h 4 Jan 2003 21:13:38 -0000 1.3.6.1
***************
*** 955,959 ****
text attached to the widget
*/
! std::string my_text;
/**
--- 955,959 ----
text attached to the widget
*/
! string my_text;
/**
Index: pgwidgetlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidgetlist.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgwidgetlist.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgwidgetlist.h 4 Jan 2003 21:13:39 -0000 1.3.6.1
***************
*** 197,201 ****
#ifndef SWIG
! std::vector < PG_Widget* > my_widgetList; // Hmmm, I know about this:
vector :))
#endif
--- 197,201 ----
#ifndef SWIG
! vector < PG_Widget* > my_widgetList; // Hmmm, I know about this: vector
:))
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/include paraconfig.h,1.3.6.11,1.3.6.12 paraconfig_macos.h,1.1.2.3,1.1.2.4 paraconfig_win32.h,1.1.1.1.6.5,1.1.1.1.6.6 paragui.h,1.3.6.3,1.3.6.4 pgapplication.h,1.3.6.4,1.3.6.5 pgcolumnitem.h,1.3,1.3.6.1 pgfile.h,1.3.6.3,1.3.6.4 pgfilearchive.h,1.3.6.4,1.3.6.5 pgfont.h,1.3.6.1,1.3.6.2 pglineedit.h,1.3,1.3.6.1 pgmaskedit.h,1.3,1.3.6.1 pgmenubar.h,1.3.6.1,1.3.6.2 pgmessageobject.h,1.3.6.2,1.3.6.3 pgnavigator.h,1.3,1.3.6.1 pgnotebook.h,1.3.6.1,1.3.6.2 pgpopupmenu.h,1.3.6.2,1.3.6.3 pgrectlist.h,1.3.6.1,1.3.6.2 pgrichedit.h,1.3.6.1,1.3.6.2 pgsurfacecache.h,1.3,1.3.6.1 pgtimerobject.h,1.1.2.5,1.1.2.6 pgwidget.h,1.3,1.3.6.1 pgwidgetlist.h,1.3,1.3.6.1,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/widgets pglineedit.cpp,1.3,1.3.6.1 pgmenubar.cpp,1.1.1.1,1.1.1.1.6.1 pgnotebook.cpp,1.3,1.3.6.1 pgpopupmenu.cpp,1.3.6.3,1.3.6.4 pgrichedit.cpp,1.3.6.4,1.3.6.5 pgthemewidget.cpp,1.3.6.5,1.3.6.6 pgwidget.cpp,1.4.4.11,1.4.4.12 pgwidgetlist.cpp,1.3.6.1,1.3.6.2 pgwidgetlistex.cpp,1.3,1.3.6.1
- Next by Date:
[paragui-cvs] CVS: paragui/src paragui.cpp,1.3.6.2,1.3.6.3
- Previous by thread:
[paragui-cvs] CVS: paragui/src/widgets pglineedit.cpp,1.3,1.3.6.1 pgmenubar.cpp,1.1.1.1,1.1.1.1.6.1 pgnotebook.cpp,1.3,1.3.6.1 pgpopupmenu.cpp,1.3.6.3,1.3.6.4 pgrichedit.cpp,1.3.6.4,1.3.6.5 pgthemewidget.cpp,1.3.6.5,1.3.6.6 pgwidget.cpp,1.4.4.11,1.4.4.12 pgwidgetlist.cpp,1.3.6.1,1.3.6.2 pgwidgetlistex.cpp,1.3,1.3.6.1
- Next by thread:
[paragui-cvs] CVS: paragui/src paragui.cpp,1.3.6.2,1.3.6.3
- Index(es):