[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/include paraconfig_macos.h,NONE,1.2.2.1 pgtim
|
From: |
Teunis Peters <address@hidden> |
|
Subject: |
[paragui-cvs] CVS: paragui/include paraconfig_macos.h,NONE,1.2.2.1 pgtimerobject.h,NONE,1.2.2.1 pgxmllayoutloader.h,NONE,1.4.2.1 pgxmltag.h,NONE,1.2.2.1 Makefile.am,1.6.2.2,1.6.2.3 paraconfig.h,1.4.2.1,1.4.2.2 paraconfig_win32.h,1.1.1.1,1.1.1.1.2.1 paragui.h,1.5.2.2,1.5.2.3 paragui_types.h,1.5.2.2,1.5.2.3 pgapplication.h,1.11.2.2,1.11.2.3 pgbutton.h,1.6.2.1,1.6.2.2 pgcheckbutton.h,1.5,1.5.2.1 pgcolumnitem.h,1.4.2.1,1.4.2.2 pgfactory.h,1.7.2.1,1.7.2.2 pgfile.h,1.4,1.4.2.1 pgfilearchive.h,1.5.2.1,1.5.2.2 pgfilelist.h,1.1,1.1.2.1 pgfont.h,1.4.2.1,1.4.2.2 pgimage.h,1.4.2.1,1.4.2.2 pglabel.h,1.4.2.1,1.4.2.2 pglayout.h,1.3,1.3.2.1 pglineedit.h,1.5.2.1,1.5.2.2 pglistbox.h,1.7,1.7.2.1 pglistboxbaseitem.h,1.3,1.3.2.1 pglistboxitem.h,1.4.2.1,1.4.2.2 pglog.h,1.3.2.2,1.3.2.3 pgmenubar.h,1.4,1.4.2.1 pgmessagebox.h,1.6,1.6.2.1 pgmessageobject.h,1.11,1.11.2.1 pgnotebook.h,1.7,1.7.2.1 pgpopupmenu.h,1.7.2.1,1.7.2.2 pgprogressbar.h,1.4.2.1,1.4.2.2 pgradiobutton.h,1.6,1.6.2.1 pgrect.h,1.5.2.1,1.5.2.2 pgrectlist.h,1.4,1.4.2.1 pgrichedit.h,1.3.2.1,1.3.2.2 pgscrollbar.h,1.6,1.6.2.1 pgsingleton.h,1.1.2.1,1.1.2.2 pgslider.h,1.5,1.5.2.1 pgspinnerbox.h,1.6,1.6.2.1 pgtabbar.h,1.4,1.4.2.1 pgthemewidget.h,1.4.2.1,1.4.2.2 pgwidget.h,1.13.2.1,1.13.2.2 pgwidgetlist.h,1.8.2.1,1.8.2.2 pgwidgetlistex.h,1.3,1.3.2.1 pgwindow.h,1.7.2.1,1.7.2.2 |
|
Date: |
Sat, 31 Aug 2002 00:01:56 -0400 |
Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv4328/include
Modified Files:
Tag: devel-opengl
Makefile.am paraconfig.h paraconfig_win32.h paragui.h
paragui_types.h pgapplication.h pgbutton.h pgcheckbutton.h
pgcolumnitem.h pgfactory.h pgfile.h pgfilearchive.h
pgfilelist.h pgfont.h pgimage.h pglabel.h pglayout.h
pglineedit.h pglistbox.h pglistboxbaseitem.h pglistboxitem.h
pglog.h pgmenubar.h pgmessagebox.h pgmessageobject.h
pgnotebook.h pgpopupmenu.h pgprogressbar.h pgradiobutton.h
pgrect.h pgrectlist.h pgrichedit.h pgscrollbar.h pgsingleton.h
pgslider.h pgspinnerbox.h pgtabbar.h pgthemewidget.h
pgwidget.h pgwidgetlist.h pgwidgetlistex.h pgwindow.h
Added Files:
Tag: devel-opengl
paraconfig_macos.h pgtimerobject.h pgxmllayoutloader.h
pgxmltag.h
Log Message:
massive changes - updates from main trunk and various bugfixes
--- NEW FILE ---
#ifndef MACOS_CONFIG_INCLUDED
#define MACOS_CONFIG_INCLUDED
/* Define if you the the SDL_image library (-lSDL_Image) */
#define HAVE_SDLIMAGE 1
/* Define the default path to the theme files */
#define PARAGUI_THEMEDIR ":data:"
/* Define if RTTI is enabled in your compiler (for dynamic_cast and typeid) */
#define RTTI_ENABLED 1
/* Define if the exception handling is enabled in your compiler */
#undef EXCEPTIONS_ENABLED
/* Define if mpatrol memory profiler support is enabled */
/* #undef MPATROL_ENABLED */
/* Define if you have the fnmatch function. */
/* #undef HAVE_FNMATCH */
/* Define if you have the strdup function. */
/* #undef HAVE_STRDUP */
/* Define if you have the strtok function. */
#define HAVE_STRTOK 1
/* Define if you have the vsnprintf function. */
#define HAVE_VSNPRINTF 1
/* Define if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
/* Define if you have the <ext/hash_map> header file. */
/* #undef HAVE_EXT_HASH_MAP */
/* Define if you have the <hash_map> header file. */
/*#define HAVE_HASH_MAP 1*/
/* Define if you have the jpeg library (-ljpeg). */
#define HAVE_LIBJPEG 1
/* Define if you have the png library (-lpng). */
#define HAVE_LIBPNG 1
/* Define if you have the tiff library (-ltiff). */
#define HAVE_LIBTIFF 1
/* Name of package */
#define PACKAGE "paragui"
/* Version number of package */
#define VERSION "1.0.3"
#endif
***** Error reading new file: [Errno 2] No such file or directory:
'pgtimerobject.h'
--- NEW FILE ---
#ifndef PG_XMLLAYOUTLOADER_H
#define PG_XMLLAYOUTLOADER_H
#include "pgsignals.h"
#include "pgrect.h"
#include "pgxmltag.h"
class PG_XMLLayoutLoader {
public:
bool Load(PG_Widget* parent, const char* filename);
PG_Signal1<PG_XMLTag&> sigStartTag;
PG_Signal1<PG_XMLTag&> sigEndTag;
private:
static void XMLStartDoc(void *userData, const char *name, const char
**atts);
static void XMLEndDoc(void *userData, const char *name);
};
#endif // PG_XMLLAYOUTLOADER_H
--- NEW FILE ---
#ifndef PG_XMLTAG_H
#define PG_XMLTAG_H
#include "pgrect.h"
#include <string>
#include <map>
class PG_Widget;
typedef enum {
DOC,
LAYOUT,
HEAD,
BODY,
WIDGET
} PG_XML_SECTION;
class PG_XMLTagList : public std::map<std::string, std::string> {
public:
PG_XMLTagList(const char** atts);
};
class PG_XMLTag {
public:
PG_XMLTag(const char* n = NULL, const char** a = NULL, PG_XML_SECTION
sec = DOC);
void Log();
inline std::string GetString(const char* name) {
return taglist[name];
}
PG_Rect GetRect(const char* name, PG_Widget* parent);
int GetInt(const char* name);
int GetAlignment(const char* name);
int GetBackmode(const char* name);
PG_Gradient* GetGradient(const char* name);
std::string name;
PG_XMLTagList taglist;
PG_XML_SECTION section;
};
#endif // PG_XMLTAG_H
Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/include/Makefile.am,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** Makefile.am 26 Jun 2002 08:47:51 -0000 1.6.2.2
--- Makefile.am 31 Aug 2002 04:01:22 -0000 1.6.2.3
***************
*** 1,3 ****
! libparaguiincludedir = $(includedir)/paragui
libparaguiinclude_HEADERS = \
--- 1,3 ----
! libparaguiincludedir = $(includedir)/paragui2
libparaguiinclude_HEADERS = \
***************
*** 38,43 ****
pgrichedit.h \
pgimage.h \
- pglayout.h \
pglog.h \
pgfilearchive.h \
pgfile.h \
--- 38,43 ----
pgrichedit.h \
pgimage.h \
pglog.h \
+ pglayout.h \
pgfilearchive.h \
pgfile.h \
***************
*** 49,52 ****
--- 49,53 ----
pgcompat.h \
pgdatacontainer.h \
+ pgtimerobject.h \
pgpoint.h \
pgsignals.h \
***************
*** 55,62 ****
--- 56,67 ----
pgfilelist.h \
pgsingleton.h \
+ pgfactory.h \
+ pgxmllayoutloader.h \
+ pgxmltag.h \
pggldraw.h
EXTRA_DIST = \
paraconfig_win32.h \
+ paraconfig_macos.h \
paraconfig_gnu.h.in
Index: paraconfig.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** paraconfig.h 26 Jun 2002 03:25:03 -0000 1.4.2.1
--- paraconfig.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 35,44 ****
#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"
#else // GNU
#include "paraconfig_gnu.h"
// For C++ compliance (required with gcc 3.0)
using std::cerr;
using std::cout;
--- 35,78 ----
#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(_MSC_VER) ||
defined(__BCPLUSPLUS__) || defined(__MWERKS__))
#include "paraconfig_win32.h"
+ #elif defined(__MACOS__)
+ #include "paraconfig_macos.h"
#else // GNU
#include "paraconfig_gnu.h"
// For C++ compliance (required with gcc 3.0)
+ #ifndef SWIG
using std::cerr;
using std::cout;
***************
*** 53,56 ****
--- 87,91 ----
using std::strncpy;
#endif // _STLPORT_VERSION
+ #endif // SWIG
#endif // GNU
***************
*** 83,86 ****
--- 118,122 ----
#endif
+
//
// Modelled after g++ stdc++ v3
***************
*** 102,105 ****
--- 138,168 ----
#define PG_UNWIND
#define PG_CATCH(_ex_, _name_) if (false)
+ #endif
+
+ //
+ // Replacement for strdup
+ //
+ #ifndef HAVE_STRDUP
+ extern "C" {
+ char* strdup(char* s);
+ }
+ #endif
+
+ // Replacement for fnmatch
+ #ifndef HAVE_FNMATCH
+ extern "C" {
+ /* Bits set in the FLAGS argument to `fnmatch'. */
+ #define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
+ #define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special
chars. */
+ #define FNM_PERIOD (1 << 2) /* Leading `.' is matched only
explicitly. */
+ #define __FNM_FLAGS (FNM_PATHNAME|FNM_NOESCAPE|FNM_PERIOD)
+
+ /* Value returned by `fnmatch' if STRING does not match PATTERN. */
+ #define FNM_NOMATCH 1
+
+ int fnmatch(const char *, const char *, int);
+ }
+ #else
+ #include <fnmatch.h>
#endif
Index: paraconfig_win32.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig_win32.h,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
*** paraconfig_win32.h 15 Apr 2002 13:22:31 -0000 1.1.1.1
--- paraconfig_win32.h 31 Aug 2002 04:01:22 -0000 1.1.1.1.2.1
***************
*** 18,21 ****
--- 18,30 ----
#define PARAGUI_THEMEDIR "./data"
+ /* Define if you have the fnmatch function. */
+ /* #undef HAVE_FNMATCH */
+
+ /* Define if you have the strdup function. */
+ #define HAVE_STRDUP 1
+
+ /* Define if you have the strtok function. */
+ #define HAVE_STRTOK 1
+
/* Define if you have the vsnprintf function. */
/* #undef HAVE_VSNPRINTF */
***************
*** 40,44 ****
/* Version number of package */
! #define VERSION "1.0.0"
#endif // WIN32_CONFIG_INCLUDED
--- 49,53 ----
/* Version number of package */
! #define VERSION "1.0.3"
#endif // WIN32_CONFIG_INCLUDED
Index: paragui.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paragui.h,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** paragui.h 26 Jun 2002 03:25:03 -0000 1.5.2.2
--- paragui.h 31 Aug 2002 04:01:22 -0000 1.5.2.3
***************
*** 2,25 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
Source File: $Source$
CVS/RCS Revision: $Revision$
--- 2,26 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
+
Source File: $Source$
CVS/RCS Revision: $Revision$
***************
*** 38,48 ****
#define PARAGUI_H
- #include <cstdlib>
- #include <iostream>
- #include <string>
-
// SDL
#include "SDL.h"
#include "SDL_thread.h"
#include "paraconfig.h"
--- 39,49 ----
#define PARAGUI_H
// SDL
#include "SDL.h"
#include "SDL_thread.h"
+
+ /* FIXME - teunis - need this? #include <cstdlib> */
+ #include <iostream>
+ #include <string>
#include "paraconfig.h"
Index: paragui_types.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paragui_types.h,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** paragui_types.h 26 Jun 2002 03:25:03 -0000 1.5.2.2
--- paragui_types.h 31 Aug 2002 04:01:22 -0000 1.5.2.3
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
Index: pgapplication.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgapplication.h,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C2 -r1.11.2.2 -r1.11.2.3
*** pgapplication.h 26 Jun 2002 03:25:03 -0000 1.11.2.2
--- pgapplication.h 31 Aug 2002 04:01:22 -0000 1.11.2.3
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 72,76 ****
}
!
int main( int argc, char **argv ) {
const int WIDTH = 640;
--- 72,76 ----
}
!
int main( int argc, char **argv ) {
const int WIDTH = 640;
***************
*** 102,106 ****
/** */
~PG_Application();
!
public:
--- 102,106 ----
/** */
~PG_Application();
!
public:
***************
*** 372,375 ****
--- 372,380 ----
static PG_Widget *GetWidgetByName(const char *Name);
+ template<class T>
+ static T* GetWidgetByName(const char* Name) {
+ return static_cast<T*>(GetWidgetByName(Name));
+ }
+
/**
Get widget by id.
***************
*** 472,481 ****
See the documentation for PG_CURSOR_MODE for more details.
\param mode the new mode for the request
! \return the previous cursor mode
*/
static PG_CURSOR_MODE ShowCursor(PG_CURSOR_MODE mode);
static PG_Font* DefaultFont;
!
/**
Sends an event to the global message queue.
--- 477,506 ----
See the documentation for PG_CURSOR_MODE for more details.
\param mode the new mode for the request
! \return the previous cursor mode
*/
static PG_CURSOR_MODE ShowCursor(PG_CURSOR_MODE mode);
+ //! Disable dirty widget updates
+ /*!
+ This function is used to disable dirty widget updates globally.
+ Dirty updates are usually used to speed up blitting. However, it can
cause
+ problems with 'semitransparent' widgets.
+ \param disable disable ditry updates
+
+ \note All widgets created after this call wont use the dirty update
anymore.
+ Widgets created before will still use this mode if enabled.
+ */
+ static void DisableDirtyUpdates(bool disable);
+
+ //! Check if the 'dirty update' mode is disabled globally
+ /*!
+ \return true - if the 'dirty update' mode is disabled globally
+ */
+ static bool GetDirtyUpdatesDisabled();
+
+ static PG_Application* GetApp();
+
static PG_Font* DefaultFont;
!
/**
Sends an event to the global message queue.
***************
*** 584,591 ****
static SDL_Color my_backcolor;
static int my_backmode;
!
static PG_Theme* my_Theme;
static std::string app_path;
! //static PG_Application* pGlobalApp;
static PG_Draw::PG_DrawableSurface* screen;
--- 609,616 ----
static SDL_Color my_backcolor;
static int my_backmode;
!
static PG_Theme* my_Theme;
static std::string app_path;
! //static PG_Application* pGlobalApp;
static PG_Draw::PG_DrawableSurface* screen;
***************
*** 600,605 ****
static PG_CURSOR_MODE my_mouse_mode;
static SDL_mutex* mutexScreen;
!
static PG_Widget* lastwidget;
static PG_Draw::PG_Draw* drawable;
friend class PG_Singleton<PG_Application>;
--- 625,631 ----
static PG_CURSOR_MODE my_mouse_mode;
static SDL_mutex* mutexScreen;
! static bool disableDirtyUpdates;
static PG_Widget* lastwidget;
+
static PG_Draw::PG_Draw* drawable;
friend class PG_Singleton<PG_Application>;
Index: pgbutton.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgbutton.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** pgbutton.h 18 Jun 2002 22:40:38 -0000 1.6.2.1
--- pgbutton.h 31 Aug 2002 04:01:22 -0000 1.6.2.2
***************
*** 118,122 ****
struct PG_ButtonDataInternal;
! class DECLSPEC PG_Button : public PG_Widget {
public:
--- 118,122 ----
struct PG_ButtonDataInternal;
! class DECLSPEC PG_Button : public PG_Widget {
public:
***************
*** 129,133 ****
@param style themestyle of the button
*/
! PG_Button(PG_Widget* parent, int id, const PG_Rect& r, const char* text
= NULL, const char* style="Button");
/** */
--- 129,133 ----
@param style themestyle of the button
*/
! PG_Button(PG_Widget* parent, int id = -1, const PG_Rect& r = PG_Rect(),
const char* text = NULL, const char* style="Button");
/** */
***************
*** 241,244 ****
--- 241,246 ----
*/
Uint8 GetBlendLevel(int mode);
+
+ void ParseXMLAttributes(PG_XMLTag& xmltag);
PG_SignalButtonClick sigButtonClick;
Index: pgcheckbutton.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcheckbutton.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** pgcheckbutton.h 27 Apr 2002 15:36:54 -0000 1.5
--- pgcheckbutton.h 31 Aug 2002 04:01:22 -0000 1.5.2.1
***************
*** 53,57 ****
@param style widget style (loaded from theme) to use
*/
! PG_CheckButton(PG_Widget* parent, int id, const PG_Rect& r, const char*
text, const char* style="CheckButton");
/** */
--- 53,57 ----
@param style widget style (loaded from theme) to use
*/
! PG_CheckButton(PG_Widget* parent, int id=-1, const PG_Rect&
r=PG_Rect(), const char* text="", const char* style="CheckButton");
/** */
Index: pgcolumnitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcolumnitem.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pgcolumnitem.h 18 Jun 2002 22:40:38 -0000 1.4.2.1
--- pgcolumnitem.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 55,59 ****
@param userdata pointer to userdata this item should refer to.
*/
! PG_ColumnItem(Uint32 columns, Uint32 height, void* userdata = NULL);
/** */
--- 55,59 ----
@param userdata pointer to userdata this item should refer to.
*/
! PG_ColumnItem(PG_ListBox* parent, Uint32 columns = 2, Uint32 height =
25, void* userdata = NULL);
/** */
Index: pgfactory.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfactory.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** pgfactory.h 26 Jun 2002 16:25:48 -0000 1.7.2.1
--- pgfactory.h 31 Aug 2002 04:01:22 -0000 1.7.2.2
***************
*** 2,31 ****
#define PG_FACTORY_H
#include <string>
! class PG_Widget;
! class PG_FactoryBaseObject {
! public:
!
! PG_FactoryBaseObject();
!
! virtual ~PG_FactoryBaseObject();
! };
! template<class T> class PG_FactoryObject : public virtual
PG_FactoryBaseObject {
public:
! static T* CreateObject(PG_Widget* parent = NULL) {
return new T(parent);
}
};
! namespace PG_Factory {
!
! template<class t> void RegisterClass(const std::string& classname);
! PG_Widget* CreateObject(const std::string& classname, PG_Widget* parent
= NULL);
! } // namespace PG_Factory
#endif // PG_FACTORY_H
--- 2,52 ----
#define PG_FACTORY_H
+ #include <map>
#include <string>
! #include "pgsingleton.h"
! class PG_Widget;
! template< class T, class PT = PG_Widget > class PG_FactoryObject {
public:
! static T* CreateObject(PT* parent) {
return new T(parent);
}
};
! template<class H>
! class PG_FactoryHolder : public PG_Singleton< PG_FactoryHolder<H> > {
! public:
!
! typedef PG_Widget* (*CREATEFN)(PG_Widget* parent);
! template< class T, class PT > static void RegisterClass(const H&
classname) {
! GetInstance().RegisterCreateFn(classname,
(CREATEFN)&PG_FactoryObject<T, PT>::CreateObject);
! }
!
! static PG_Widget* CreateObject(const H& classname, PG_Widget* parent =
NULL) {
! CREATEFN create = GetInstance().creator_map[classname];
!
! if(create == NULL) {
! return NULL;
! }
!
! return create(parent);
! }
!
! protected:
!
! inline void RegisterCreateFn(const H& classname, CREATEFN fn) {
! creator_map[classname] = fn;
! }
! std::map< H, PG_FactoryHolder<H>::CREATEFN > creator_map;
!
! friend class PG_Singleton< PG_FactoryHolder<H> >;
!
! };
!
! typedef PG_FactoryHolder<std::string> PG_Factory;
#endif // PG_FACTORY_H
Index: pgfile.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfile.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** pgfile.h 27 Apr 2002 15:36:54 -0000 1.4
--- pgfile.h 31 Aug 2002 04:01:22 -0000 1.4.2.1
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 36,39 ****
--- 36,44 ----
#include "paragui.h"
+ // strange hack needed for GCC 2.91 - Alex
+ #ifdef getc
+ #undef getc
+ #endif
+
/**
* @author Alexander Pipelka
***************
*** 129,132 ****
--- 134,158 ----
int fileLength();
+ /**
+ get a single character from the file
+ */
+ char getc();
+
+ /**
+ read a line from the file.
+
+ This function reads a CR/LF terminated line of text from the file.
+ Any trailing carriage return and linefeed characters will be skipped.
+ */
+ std::string getline();
+
+ /**
+ write a line to the file
+ @param line text to write
+ This functions writes a line of text to a file. Carriage return (and
linefeed)
+ characters will be added.
+ */
+ void putline(const std::string& line);
+
private:
void* file;
Index: pgfilearchive.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfilearchive.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** pgfilearchive.h 18 Jun 2002 22:40:38 -0000 1.5.2.1
--- pgfilearchive.h 31 Aug 2002 04:01:22 -0000 1.5.2.2
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 220,223 ****
--- 220,232 ----
static PG_File* OpenFile(const char* filename,
PG_OPEN_MODE mode = PG_OPEN_READ);
+
+ /**
+ Open a file from the archive
+ @param filename name of the file to open
+ @param mode the open mode
+ @return pointer SDL_RWops structure
+ */
+ static SDL_RWops* OpenFileRWops(const char* filename,
+ PG_OPEN_MODE mode = PG_OPEN_READ);
//! Open and read a file from the archive
***************
*** 230,233 ****
--- 239,243 ----
*/
static PG_DataContainer* ReadFile(const char* filename);
+
/**
Load a surface (image) from the archive
***************
*** 257,260 ****
--- 267,296 ----
static void EnableSymlinks(bool followSymlinks);
+ //! Get the names of all registered archives
+ /*!
+
+ This function returns a vector of strings containing the names
+ of all currently registered archives (Added via AddArchive)
+
+ \note The caller owns the returned vector and is responsible for
deleting the returned structure.
+
+ \return the file list
+ */
+ static PG_FileList GetSearchPathList();
+
+
+ //! Get the names of all files in a directory
+ /*!
+
+ This function returns a vector of strings containing the names
+ of all files in the specified directory.
+
+ \note The caller owns the returned vector and is responsible for
deleting the returned structure.
+ \param dir directory to list files in
+ \param wildcard wildcard for file pattern matching
+ \return the file list
+ */
+ static PG_FileList EnumerateFiles(const char *dir, const char*
wildcard);
+
private:
Index: pgfilelist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfilelist.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** pgfilelist.h 29 Apr 2002 11:44:21 -0000 1.1
--- pgfilelist.h 31 Aug 2002 04:01:22 -0000 1.1.2.1
***************
*** 8,11 ****
--- 8,13 ----
public:
+ PG_FileList();
+
PG_FileList(char** list);
Index: pgfont.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfont.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pgfont.h 18 Jun 2002 22:40:38 -0000 1.4.2.1
--- pgfont.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 64,68 ****
This class defines the parameters of a font (size, style, ...)
*/
! class PG_Font {
public:
--- 64,68 ----
This class defines the parameters of a font (size, style, ...)
*/
! class DECLSPEC PG_Font {
public:
Index: pgimage.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgimage.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pgimage.h 18 Jun 2002 22:40:38 -0000 1.4.2.1
--- pgimage.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 52,56 ****
This constructor creates the widget and loads the image from a file
*/
! PG_Image(PG_Widget* parent, const PG_Point& p, const char* filename,
const char* style = "ThemeWidget");
/**
--- 52,56 ----
This constructor creates the widget and loads the image from a file
*/
! PG_Image(PG_Widget* parent, const PG_Point& p = PG_Point(0,0), const
char* filename=NULL, const char* style = "ThemeWidget");
/**
Index: pglabel.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglabel.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pglabel.h 18 Jun 2002 22:40:38 -0000 1.4.2.1
--- pglabel.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 51,55 ****
@param style initial widget style (from xml theme)
*/
! PG_Label(PG_Widget* parent, const PG_Rect& r, const char* text, const
char* style="Label");
/** Only destructor */
--- 51,55 ----
@param style initial widget style (from xml theme)
*/
! PG_Label(PG_Widget* parent, const PG_Rect& r = PG_Rect(), const char*
text = "", const char* style="Label");
/** Only destructor */
***************
*** 77,80 ****
--- 77,82 ----
void SetIndent(int indent);
+ void ParseXMLAttributes(PG_XMLTag& xmltag);
+
protected:
Index: pglayout.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglayout.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** pglayout.h 15 Apr 2002 13:35:35 -0000 1.3
--- pglayout.h 31 Aug 2002 04:01:22 -0000 1.3.2.1
***************
*** 40,43 ****
--- 40,44 ----
loading XML widget layouts.
*/
+
namespace PG_Layout {
***************
*** 52,61 ****
DECLSPEC bool Load(PG_Widget* parent, const char *filename, void (*
WorkCallback)(int now, int max), void *UserSpace);
! int GetParamInt(const char **Source, char *What);
! char* GetParamStr(const char **Source, char *What);
! void GetParamRect(const char **Source, char *What, PG_Rect& Rect, PG_Widget*
parent = NULL);
! int GetParamAlign(const char **Source, char *What);
! int GetParamIMode(const char **Source, char *What);
! int GetParamGrad(const char **Source, char *What, PG_Gradient *grad);
};
--- 53,62 ----
DECLSPEC bool Load(PG_Widget* parent, const char *filename, void (*
WorkCallback)(int now, int max), void *UserSpace);
! DECLSPEC int GetParamInt(const char **Source, char *What);
! DECLSPEC char* GetParamStr(const char **Source, char *What);
! DECLSPEC void GetParamRect(const char **Source, char *What, PG_Rect& Rect,
PG_Widget* parent = NULL);
! DECLSPEC int GetParamAlign(const char **Source, char *What);
! DECLSPEC int GetParamIMode(const char **Source, char *What);
! DECLSPEC int GetParamGrad(const char **Source, char *What, PG_Gradient *grad);
};
Index: pglineedit.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglineedit.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** pglineedit.h 18 Jun 2002 22:40:38 -0000 1.5.2.1
--- pglineedit.h 31 Aug 2002 04:01:22 -0000 1.5.2.2
***************
*** 49,53 ****
/** */
! PG_LineEdit(PG_Widget* parent, const PG_Rect& r, const char*
style="LineEdit", int maximumLength = 1000000);
/** */
--- 49,53 ----
/** */
! PG_LineEdit(PG_Widget* parent, const PG_Rect& r=PG_Rect(), const char*
style="LineEdit", int maximumLength = 1000000);
/** */
Index: pglistbox.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistbox.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** pglistbox.h 30 Apr 2002 10:18:38 -0000 1.7
--- pglistbox.h 31 Aug 2002 04:01:22 -0000 1.7.2.1
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 43,47 ****
/** */
! PG_ListBox(PG_Widget* parent, const PG_Rect& r, const char*
style="ListBox");
/** */
--- 43,47 ----
/** */
! PG_ListBox(PG_Widget* parent, const PG_Rect& r=PG_Rect(), const char*
style="ListBox");
/** */
***************
*** 49,55 ****
/** */
- void AddItem(PG_ListBoxItem* item);
-
- /** */
void SetMultiSelect(bool multi = true);
--- 49,52 ----
***************
*** 97,100 ****
--- 94,100 ----
/** */
+ void AddChild(PG_ListBoxBaseItem* item);
+
+ /** */
bool eventMouseButtonUp(const SDL_MouseButtonEvent* button);
***************
*** 105,111 ****
bool eventMouseMotion(const SDL_MouseMotionEvent* motion);
private:
! void AddWidget(PG_Widget* w);
bool my_multiselect;
--- 105,113 ----
bool eventMouseMotion(const SDL_MouseMotionEvent* motion);
+ friend class PG_ListBoxBaseItem;
+
private:
! //void AddWidget(PG_Widget* w);
bool my_multiselect;
***************
*** 114,118 ****
PG_ListBoxItem* my_selectedItem;
-
};
--- 116,119 ----
Index: pglistboxbaseitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistboxbaseitem.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** pglistboxbaseitem.h 15 Apr 2002 13:35:35 -0000 1.3
--- pglistboxbaseitem.h 31 Aug 2002 04:01:22 -0000 1.3.2.1
***************
*** 44,48 ****
/** */
! PG_ListBoxBaseItem(int height, void* userdata = NULL);
/** */
--- 44,48 ----
/** */
! PG_ListBoxBaseItem(PG_ListBox* parent, int height = 25, void* userdata
= NULL);
/** */
Index: pglistboxitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistboxitem.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pglistboxitem.h 18 Jun 2002 22:40:38 -0000 1.4.2.1
--- pglistboxitem.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 38,42 ****
/** */
! PG_ListBoxItem(int height, const char* text = NULL,
PG_Draw::PG_DrawableSurface* icon = NULL, void* userdata = NULL, const char*
style="ListBox");
/** */
--- 38,42 ----
/** */
! PG_ListBoxItem(PG_ListBox* parent, int height = 25, const char* text =
NULL, PG_Draw::PG_DrawableSurface* icon = NULL, void* userdata = NULL, const
char* style="ListBox");
/** */
***************
*** 46,49 ****
--- 46,51 ----
void LoadThemeStyle(const char* widgettype, const char* objectname);
+ void ParseXMLAttributes(PG_XMLTag& xmltag);
+
protected:
Index: pglog.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglog.h,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** pglog.h 26 Jun 2002 03:25:03 -0000 1.3.2.2
--- pglog.h 31 Aug 2002 04:01:22 -0000 1.3.2.3
***************
*** 81,84 ****
--- 81,86 ----
DECLSPEC void SetMethod(int method);
DECLSPEC int GetMethod();
+ DECLSPEC void SetConsoleKey(SDLKey key);
+ DECLSPEC SDLKey GetConsoleKey();
};
Index: pgmenubar.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmenubar.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** pgmenubar.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgmenubar.h 31 Aug 2002 04:01:22 -0000 1.4.2.1
***************
*** 54,58 ****
Use the Add member function to insert PG_PopupMenu objects.
*/
! PG_MenuBar(PG_Widget* parent, const PG_Rect& rect, const char* style =
"MenuBar");
/**
--- 54,58 ----
Use the Add member function to insert PG_PopupMenu objects.
*/
! PG_MenuBar(PG_Widget* parent, const PG_Rect& rect=PG_Rect(), const
char* style = "MenuBar");
/**
Index: pgmessagebox.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmessagebox.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** pgmessagebox.h 2 May 2002 09:50:38 -0000 1.6
--- pgmessagebox.h 31 Aug 2002 04:01:22 -0000 1.6.2.1
***************
*** 55,59 ****
@param textalign
Alignment for windowtext
*/
! PG_MessageBox(PG_Widget* parent, const PG_Rect& r, const char*
windowtitle, const char* windowtext, const PG_Rect& btn1, const char* btn1text,
const PG_Rect& btn2, const char* btn2text, int textalign=PG_TA_CENTER, const
char* style="MessageBox");
/**
--- 55,59 ----
@param textalign
Alignment for windowtext
*/
! PG_MessageBox(PG_Widget* parent, const PG_Rect& r=PG_Rect(), const
char* windowtitle="", const char* windowtext="", const PG_Rect& btn1=PG_Rect(),
const char* btn1text="", const PG_Rect& btn2=PG_Rect(), const char*
btn2text="", int textalign=PG_TA_CENTER, const char* style="MessageBox");
/**
***************
*** 68,72 ****
@param textalign
Alignment for windowtext
*/
! PG_MessageBox(PG_Widget* parent, const PG_Rect& r, const char*
windowtitle, const char* windowtext, const PG_Rect& btn1, const char* btn1text,
int textalign=PG_TA_CENTER, const char* style="MessageBox");
/**
--- 68,72 ----
@param textalign
Alignment for windowtext
*/
! PG_MessageBox(PG_Widget* parent, const PG_Rect& r=PG_Rect(), const
char* windowtitle="", const char* windowtext="", const PG_Rect& btn1=PG_Rect(),
const char* btn1text="", int textalign=PG_TA_CENTER, const char*
style="MessageBox");
/**
Index: pgmessageobject.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmessageobject.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** pgmessageobject.h 6 May 2002 11:18:01 -0000 1.11
--- pgmessageobject.h 31 Aug 2002 04:01:22 -0000 1.11.2.1
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
Index: pgnotebook.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgnotebook.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** pgnotebook.h 2 May 2002 09:50:38 -0000 1.7
--- pgnotebook.h 31 Aug 2002 04:01:22 -0000 1.7.2.1
***************
*** 14,18 ****
} TabBarPos;
! PG_NoteBook(PG_Widget* parent, const PG_Rect& r, TabBarPos pos = top,
int BarHeight = 33, const char* style="TabBar");
~PG_NoteBook();
--- 14,18 ----
} TabBarPos;
! PG_NoteBook(PG_Widget* parent, const PG_Rect& r=PG_Rect(), TabBarPos
pos = top, int BarHeight = 33, const char* style="TabBar");
~PG_NoteBook();
Index: pgpopupmenu.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgpopupmenu.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** pgpopupmenu.h 18 Jun 2002 22:40:38 -0000 1.7.2.1
--- pgpopupmenu.h 31 Aug 2002 04:01:22 -0000 1.7.2.2
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 115,121 ****
PG_SignalMenuItemSelected sigMenuItemSelect;
!
PG_Pointer* data;
!
private: // methods
void initItem();
--- 115,121 ----
PG_SignalMenuItemSelected sigMenuItemSelect;
!
PG_Pointer* data;
!
private: // methods
void initItem();
***************
*** 184,189 ****
PG_PopupMenu(PG_Widget *parent,
! int x, int y,
! char *caption,
char *style = "PopupMenu");
--- 184,189 ----
PG_PopupMenu(PG_Widget *parent,
! int x=0, int y=0,
! char *caption="",
char *style = "PopupMenu");
Index: pgprogressbar.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgprogressbar.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pgprogressbar.h 18 Jun 2002 22:40:38 -0000 1.4.2.1
--- pgprogressbar.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 47,51 ****
/** */
! PG_ProgressBar(PG_Widget* parent, const PG_Rect& r, const char*
style="Progressbar");
/** */
--- 47,51 ----
/** */
! PG_ProgressBar(PG_Widget* parent, const PG_Rect& r=PG_Rect(), const
char* style="Progressbar");
/** */
Index: pgradiobutton.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgradiobutton.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** pgradiobutton.h 2 May 2002 09:50:38 -0000 1.6
--- pgradiobutton.h 31 Aug 2002 04:01:22 -0000 1.6.2.1
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 53,57 ****
/** */
! PG_RadioButton(PG_Widget* parent, int id, const PG_Rect& r, const char*
text, PG_RadioButton* firstOfGroup = NULL, const char* style="RadioButton");
/** */
--- 53,57 ----
/** */
! PG_RadioButton(PG_Widget* parent, int id=-1, const PG_Rect&
r=PG_Rect(), const char* text="", PG_RadioButton* firstOfGroup = NULL, const
char* style="RadioButton");
/** */
***************
*** 65,68 ****
--- 65,71 ----
/** */
void SetPressed();
+
+ /** Sets text alignment */
+ void SetAlignment(int a);
/** */
Index: pgrect.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrect.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** pgrect.h 18 Jun 2002 22:40:38 -0000 1.5.2.1
--- pgrect.h 31 Aug 2002 04:01:22 -0000 1.5.2.2
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
Index: pgrectlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrectlist.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** pgrectlist.h 27 Apr 2002 15:36:55 -0000 1.4
--- pgrectlist.h 31 Aug 2002 04:01:22 -0000 1.4.2.1
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
Index: pgrichedit.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrichedit.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** pgrichedit.h 18 Jun 2002 22:40:38 -0000 1.3.2.1
--- pgrichedit.h 31 Aug 2002 04:01:22 -0000 1.3.2.2
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 47,51 ****
Constructor of the PG_WidgetListEx class
*/
! PG_RichEdit(PG_Widget* parent, const PG_Rect& r, bool
autoVerticalResize = false, Uint32 linewidth = 0, Uint32 tabSize = 30, Uint32
childsborderwidth = 8, const char* style="WidgetList");
/**
--- 47,51 ----
Constructor of the PG_WidgetListEx class
*/
! PG_RichEdit(PG_Widget* parent, const PG_Rect& r=PG_Rect(), bool
autoVerticalResize = false, Uint32 linewidth = 0, Uint32 tabSize = 30, Uint32
childsborderwidth = 8, const char* style="WidgetList");
/**
***************
*** 73,76 ****
--- 73,84 ----
bool RemoveWidget(PG_Widget* w, bool shiftx = false, bool shifty =
false);
+ //! Load the content of the widget from a text file
+ /*!
+ This function loads the text of the widget from a file. As ever this
file operation is done transparently
+ through PhysFS so you can place any text files into your theme and or
file archives.
+ \param textfile relative path to the text file
+ */
+ bool LoadText(const char* textfile);
+
protected:
Index: pgscrollbar.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgscrollbar.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** pgscrollbar.h 2 May 2002 09:50:38 -0000 1.6
--- pgscrollbar.h 31 Aug 2002 04:01:22 -0000 1.6.2.1
***************
*** 85,89 ****
/** */
! PG_ScrollBar(PG_Widget* parent, int id, const PG_Rect& r, int direction
= PG_SB_VERTICAL, const char* style="Scrollbar");
/** */
--- 85,89 ----
/** */
! PG_ScrollBar(PG_Widget* parent, int id, const PG_Rect& r=PG_Rect(), int
direction = PG_SB_VERTICAL, const char* style="Scrollbar");
/** */
Index: pgsingleton.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgsingleton.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** pgsingleton.h 26 Jun 2002 03:25:03 -0000 1.1.2.1
--- pgsingleton.h 31 Aug 2002 04:01:22 -0000 1.1.2.2
***************
*** 10,17 ****
protected:
! PG_Singleton() {};
! ~PG_Singleton() {};
private:
PG_Singleton(const T&) {};
T& operator=(const T&) {};
--- 10,22 ----
protected:
! PG_Singleton() {
! }
!
! ~PG_Singleton() {
! }
private:
+ // PG_Singleton(const T&);
+ // T& operator=(const T&);
PG_Singleton(const T&) {};
T& operator=(const T&) {};
Index: pgslider.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgslider.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** pgslider.h 27 Apr 2002 15:36:55 -0000 1.5
--- pgslider.h 31 Aug 2002 04:01:22 -0000 1.5.2.1
***************
*** 38,42 ****
/** */
! PG_Slider(PG_Widget* parent, int id, const PG_Rect& r, int direction =
PG_SB_VERTICAL, const char* style="Slider");
/** */
--- 38,42 ----
/** */
! PG_Slider(PG_Widget* parent, int id, const PG_Rect& r=PG_Rect(), int
direction = PG_SB_VERTICAL, const char* style="Slider");
/** */
Index: pgspinnerbox.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgspinnerbox.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** pgspinnerbox.h 2 May 2002 09:50:38 -0000 1.6
--- pgspinnerbox.h 31 Aug 2002 04:01:22 -0000 1.6.2.1
***************
*** 58,62 ****
/**
*/
! PG_SpinnerBox(PG_Widget *parent, const PG_Rect& r, const char* style =
"SpinnerBox");
/**
--- 58,62 ----
/**
*/
! PG_SpinnerBox(PG_Widget *parent, const PG_Rect& r=PG_Rect(), const
char* style = "SpinnerBox");
/**
Index: pgtabbar.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgtabbar.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** pgtabbar.h 28 Apr 2002 16:35:30 -0000 1.4
--- pgtabbar.h 31 Aug 2002 04:01:22 -0000 1.4.2.1
***************
*** 12,16 ****
public:
! PG_TabBar(PG_Widget* parent, const PG_Rect r, const char* style =
"TabBar");
~PG_TabBar();
--- 12,16 ----
public:
! PG_TabBar(PG_Widget* parent, const PG_Rect r=PG_Rect(), const char*
style = "TabBar");
~PG_TabBar();
Index: pgthemewidget.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgthemewidget.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** pgthemewidget.h 18 Jun 2002 22:40:38 -0000 1.4.2.1
--- pgthemewidget.h 31 Aug 2002 04:01:22 -0000 1.4.2.2
***************
*** 88,92 ****
All drawing operations can be done via the eventBlit() callback handler.
*/
! PG_ThemeWidget(PG_Widget* parent, const PG_Rect& r, const char*
style="ThemeWidget");
/**
--- 88,92 ----
All drawing operations can be done via the eventBlit() callback handler.
*/
! PG_ThemeWidget(PG_Widget* parent, const PG_Rect& r = PG_Rect(), const
char* style="ThemeWidget");
/**
***************
*** 152,155 ****
--- 152,161 ----
/**
+ Get the background gradient
+ @return the background gradient
+ */
+ PG_Gradient GetGradient();
+
+ /**
Set the bordersize of the widget
param b bordersize in pixels (currently 0,1,2)
***************
*** 203,206 ****
--- 209,216 ----
static void DeleteThemedSurface(PG_Draw::PG_DrawableSurface* surface);
+ void SetSimpleBackground(bool simple);
+
+ void SetBackgroundColor(const SDL_Color& c);
+
protected:
Index: pgwidget.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidget.h,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** pgwidget.h 18 Jun 2002 22:40:38 -0000 1.13.2.1
--- pgwidget.h 31 Aug 2002 04:01:22 -0000 1.13.2.2
***************
*** 33,36 ****
--- 33,37 ----
#include "pgrectlist.h"
#include "pgfont.h"
+ #include "pgxmltag.h"
#include MAP_INC
***************
*** 71,75 ****
*/
! class DECLSPEC PG_Widget : public PG_MessageObject, public PG_Rect {
public:
/**
--- 72,76 ----
*/
! class DECLSPEC PG_Widget : public PG_MessageObject, public PG_Rect {
public:
/**
***************
*** 81,85 ****
This is the constructor for the PG_Widget class (really!)
*/
! PG_Widget(PG_Widget* parent, const PG_Rect& rect);
/**
--- 82,86 ----
This is the constructor for the PG_Widget class (really!)
*/
! PG_Widget(PG_Widget* parent, const PG_Rect& rect = PG_Rect());
/**
***************
*** 728,731 ****
--- 729,734 ----
bool IsHidden();
+
+ virtual void ParseXMLAttributes(PG_XMLTag& xmltag);
protected:
Index: pgwidgetlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidgetlist.h,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** pgwidgetlist.h 18 Jun 2002 22:40:38 -0000 1.8.2.1
--- pgwidgetlist.h 31 Aug 2002 04:01:22 -0000 1.8.2.2
***************
*** 52,56 ****
Constructor of the PG_Widget class
*/
! PG_WidgetList(PG_Widget* parent, const PG_Rect& r, const char*
style="WidgetList");
/**
--- 52,56 ----
Constructor of the PG_Widget class
*/
! PG_WidgetList(PG_Widget* parent, const PG_Rect& r=PG_Rect(), const
char* style="WidgetList");
/**
***************
*** 63,73 ****
/**
- Add a widget to the list
-
- @param w pointer to a widget
- */
- virtual void AddWidget(PG_Widget* w);
-
- /**
Remove a widget from the list
--- 63,66 ----
***************
*** 155,158 ****
--- 148,158 ----
protected:
+ /**
+ Add a widget to the list
+
+ @param w pointer to a widget
+ */
+ void AddChild(PG_Widget* w);
+
/** */
void eventBlit(PG_Draw::PG_DrawableSurface* srf, const PG_Rect& src,
const PG_Rect& dst);
***************
*** 208,211 ****
--- 208,213 ----
private:
+ bool bInConstructor;
+
PG_WidgetList(const PG_WidgetList&);
PG_WidgetList& operator=(const PG_WidgetList&);
Index: pgwidgetlistex.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidgetlistex.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** pgwidgetlistex.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgwidgetlistex.h 31 Aug 2002 04:01:22 -0000 1.3.2.1
***************
*** 2,23 ****
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
--- 2,23 ----
ParaGUI - crossplatform widgetset
Copyright (C) 2000,2001,2002 Alexander Pipelka
!
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
!
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
!
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
!
Alexander Pipelka
address@hidden
!
Last Update: $Author$
Update Date: $Date$
***************
*** 41,64 ****
*/
! class PG_WidgetListEx : public PG_WidgetList {
public:
/**
Constructor of the PG_WidgetListEx class
*/
! PG_WidgetListEx(PG_Widget* parent, const PG_Rect& r, const char*
style="WidgetList");
/**
! Add a widget to the list
@param w pointer to a widget
*/
! void AddWidget(PG_Widget* w);
/**
! Remove a widget from the list
@param w pointer to a widget
*/
! bool RemoveWidget(PG_Widget* w, bool shiftx = false, bool shifty =
false);
};
--- 41,66 ----
*/
! class DECLSPEC PG_WidgetListEx : public PG_WidgetList {
public:
/**
Constructor of the PG_WidgetListEx class
*/
! PG_WidgetListEx(PG_Widget* parent, const PG_Rect& r=PG_Rect(), const
char* style="WidgetList");
/**
! Remove a widget from the list
@param w pointer to a widget
*/
! bool RemoveWidget(PG_Widget* w, bool shiftx = false, bool shifty =
false);
+ protected:
+
/**
! Add a widget to the list
@param w pointer to a widget
*/
! void AddChild(PG_Widget* w);
};
Index: pgwindow.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwindow.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** pgwindow.h 18 Jun 2002 22:40:38 -0000 1.7.2.1
--- pgwindow.h 31 Aug 2002 04:01:22 -0000 1.7.2.2
***************
*** 55,59 ****
/** */
! PG_Window(PG_Widget* parent, const PG_Rect& r, const char* windowtext,
Uint32 flags = WF_DEFAULT, const char* style="Window", int heightTitlebar = 25);
/** */
--- 55,59 ----
/** */
! PG_Window(PG_Widget* parent, const PG_Rect& r = PG_Rect(), const char*
windowtext = "", Uint32 flags = WF_DEFAULT, const char* style="Window", int
heightTitlebar = 25);
/** */
***************
*** 67,70 ****
--- 67,72 ----
int RunModal();
+
+ void SetTitle(const char* title);
PG_SignalWindowClose sigWindowClose;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/include paraconfig_macos.h,NONE,1.2.2.1 pgtimerobject.h,NONE,1.2.2.1 pgxmllayoutloader.h,NONE,1.4.2.1 pgxmltag.h,NONE,1.2.2.1 Makefile.am,1.6.2.2,1.6.2.3 paraconfig.h,1.4.2.1,1.4.2.2 paraconfig_win32.h,1.1.1.1,1.1.1.1.2.1 paragui.h,1.5.2.2,1.5.2.3 paragui_types.h,1.5.2.2,1.5.2.3 pgapplication.h,1.11.2.2,1.11.2.3 pgbutton.h,1.6.2.1,1.6.2.2 pgcheckbutton.h,1.5,1.5.2.1 pgcolumnitem.h,1.4.2.1,1.4.2.2 pgfactory.h,1.7.2.1,1.7.2.2 pgfile.h,1.4,1.4.2.1 pgfilearchive.h,1.5.2.1,1.5.2.2 pgfilelist.h,1.1,1.1.2.1 pgfont.h,1.4.2.1,1.4.2.2 pgimage.h,1.4.2.1,1.4.2.2 pglabel.h,1.4.2.1,1.4.2.2 pglayout.h,1.3,1.3.2.1 pglineedit.h,1.5.2.1,1.5.2.2 pglistbox.h,1.7,1.7.2.1 pglistboxbaseitem.h,1.3,1.3.2.1 pglistboxitem.h,1.4.2.1,1.4.2.2 pglog.h,1.3.2.2,1.3.2.3 pgmenubar.h,1.4,1.4.2.1 pgmessagebox.h,1.6,1.6.2.1 pgmessageobject.h,1.11,1.11.2.1 pgnotebook.h,1.7,1.7.2.1 pgpopupmenu.h,1.7.2.1,1.7.2.2 pgprogressbar.h,1.4.2.1,1.4.2.2 pgradiobutton.h,1.6,1.6.2.1 pgrect.h,1.5.2.1,1.5.2.2 pgrectlist.h,1.4,1.4.2.1 pgrichedit.h,1.3.2.1,1.3.2.2 pgscrollbar.h,1.6,1.6.2.1 pgsingleton.h,1.1.2.1,1.1.2.2 pgslider.h,1.5,1.5.2.1 pgspinnerbox.h,1.6,1.6.2.1 pgtabbar.h,1.4,1.4.2.1 pgthemewidget.h,1.4.2.1,1.4.2.2 pgwidget.h,1.13.2.1,1.13.2.2 pgwidgetlist.h,1.8.2.1,1.8.2.2 pgwidgetlistex.h,1.3,1.3.2.1 pgwindow.h,1.7.2.1,1.7.2.2,
Teunis Peters <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/core missing.cpp,NONE,1.2.2.1 pgtimerobject.cpp,NONE,1.2.2.1 physfsrwops.cpp,NONE,1.2.2.1 Makefile.am,1.4,1.4.2.1 pgapplication.cpp,1.10.2.3,1.10.2.4 pgcolors.cpp,1.1.2.1,1.1.2.2 pgdatacontainer.cpp,1.1,1.1.2.1 pgfile.cpp,1.1,1.1.2.1 pgfilearchive.cpp,1.4.2.1,1.4.2.2 pgfilelist.cpp,1.1,1.1.2.1 pglog.cpp,1.1,1.1.2.1 pgmain.cpp,1.1,1.1.2.1 pgmessageobject.cpp,1.8,1.8.2.1 pgnavigator.cpp,1.2,1.2.2.1 pgrectlist.cpp,1.2.2.1,1.2.2.2 pgsurfacecache.cpp,1.2.2.3,1.2.2.4
- Previous by thread:
[paragui-cvs] CVS: paragui/src/core missing.cpp,NONE,1.2.2.1 pgtimerobject.cpp,NONE,1.2.2.1 physfsrwops.cpp,NONE,1.2.2.1 Makefile.am,1.4,1.4.2.1 pgapplication.cpp,1.10.2.3,1.10.2.4 pgcolors.cpp,1.1.2.1,1.1.2.2 pgdatacontainer.cpp,1.1,1.1.2.1 pgfile.cpp,1.1,1.1.2.1 pgfilearchive.cpp,1.4.2.1,1.4.2.2 pgfilelist.cpp,1.1,1.1.2.1 pglog.cpp,1.1,1.1.2.1 pgmain.cpp,1.1,1.1.2.1 pgmessageobject.cpp,1.8,1.8.2.1 pgnavigator.cpp,1.2,1.2.2.1 pgrectlist.cpp,1.2.2.1,1.2.2.2 pgsurfacecache.cpp,1.2.2.3,1.2.2.4
- Index(es):