[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/include Makefile.am,1.2,1.3 paraconfig.h,1.3,
|
From: |
Alexander Pipelka <address@hidden> |
|
Subject: |
[paragui-cvs] CVS: paragui/include Makefile.am,1.2,1.3 paraconfig.h,1.3,1.4 paragui.h,1.4,1.5 paragui_types.h,1.4,1.5 pgapplication.h,1.4,1.5 pgbutton.h,1.5,1.6 pgcheckbutton.h,1.4,1.5 pgcolumnitem.h,1.3,1.4 pgdraw.h,1.3,1.4 pgdropdown.h,1.4,1.5 pgfile.h,1.3,1.4 pgfilearchive.h,1.3,1.4 pgfont.h,1.3,1.4 pgimage.h,1.3,1.4 pglabel.h,1.3,1.4 pglineedit.h,1.4,1.5 pglistbox.h,1.4,1.5 pglistboxitem.h,1.3,1.4 pgmaskedit.h,1.3,1.4 pgmessagebox.h,1.4,1.5 pgmessageobject.h,1.4,1.5 pgpopupmenu.h,1.4,1.5 pgprogressbar.h,1.3,1.4 pgradiobutton.h,1.4,1.5 pgrect.h,1.3,1.4 pgrectlist.h,1.3,1.4 pgscrollbar.h,1.4,1.5 pgslider.h,1.4,1.5 pgspinnerbox.h,1.4,1.5 pgtheme.h,1.3,1.4 pgthemewidget.h,1.3,1.4 pgwidget.h,1.4,1.5 pgwidgetdnd.h,1.3,1.4 pgwidgetlist.h,1.4,1.5 pgwindow.h,1.4,1.5 pgbuttongroup.h,1.3,NONE |
|
Date: |
Sat, 27 Apr 2002 11:36:59 -0400 |
Update of /cvsroot/paragui/paragui/include
In directory subversions:/tmp/cvs-serv11267/include
Modified Files:
Makefile.am paraconfig.h paragui.h paragui_types.h
pgapplication.h pgbutton.h pgcheckbutton.h pgcolumnitem.h
pgdraw.h pgdropdown.h pgfile.h pgfilearchive.h pgfont.h
pgimage.h pglabel.h pglineedit.h pglistbox.h pglistboxitem.h
pgmaskedit.h pgmessagebox.h pgmessageobject.h pgpopupmenu.h
pgprogressbar.h pgradiobutton.h pgrect.h pgrectlist.h
pgscrollbar.h pgslider.h pgspinnerbox.h pgtheme.h
pgthemewidget.h pgwidget.h pgwidgetdnd.h pgwidgetlist.h
pgwindow.h
Removed Files:
pgbuttongroup.h
Log Message:
removed all swig #ifdef's
As nobody seems to use swig python bindings i removed this.
I want to concentrate on a clean C++ implementation.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/paragui/paragui/include/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 27 Apr 2002 11:57:22 -0000 1.2
--- Makefile.am 27 Apr 2002 15:36:54 -0000 1.3
***************
*** 49,52 ****
--- 49,53 ----
pgcompat.h \
pgdatacontainer.h \
+ pgpoint.h \
pgsignals.h
Index: paraconfig.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paraconfig.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** paraconfig.h 15 Apr 2002 13:35:35 -0000 1.3
--- paraconfig.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 39,43 ****
// For C++ compliance (required with gcc 3.0)
- #ifndef SWIG
using std::cerr;
using std::cout;
--- 39,42 ----
***************
*** 52,56 ****
using std::strncpy;
#endif // _STLPORT_VERSION
- #endif // SWIG
#endif // GNU
--- 51,54 ----
Index: paragui.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paragui.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** paragui.h 27 Apr 2002 11:57:22 -0000 1.4
--- paragui.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 38,83 ****
#define PARAGUI_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module paragui
- %{
- #include "paragui.h"
- %}
- %include "paragui_types.h"
- %include "pgrect.h"
- %include "pgmessageobject.h"
- %include "pgwidget.h"
- %include "pgthemewidget.h"
- %include "pgwidgetdnd.h"
- %include "pgwidgetlist.h"
- %include "pgfilearchive.h"
- %include "pgfile.h"
- %include "pgfont.h"
- %include "pgapplication.h"
- %include "pgbutton.h"
- %include "pgradiobutton.h"
- %include "pgcheckbutton.h"
- %include "pglabel.h"
- %include "pglineedit.h"
- %include "pgscrollbar.h"
- %include "pgprogressbar.h"
- %include "pgwindow.h"
- %include "pgslider.h"
- %include "pglistboxbaseitem.h"
- %include "pglistboxitem.h"
- %include "pgcolumnitem.h"
- %include "pglistbox.h"
- %include "pgmaskedit.h"
- %include "pgmessagebox.h"
- %include "pgspinnerbox.h"
- %include "pgimage.h"
- %include "pgpopupmenu.h"
- #endif
-
- #ifndef SWIG
#include <cstdlib>
#include <iostream>
#include <string>
- #endif
// SDL
--- 38,44 ----
***************
*** 93,98 ****
#include "paragui_types.h"
-
- #include "pgrect.h"
/**
--- 54,57 ----
Index: paragui_types.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/paragui_types.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** paragui_types.h 27 Apr 2002 11:57:22 -0000 1.4
--- paragui_types.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 35,59 ****
#define PARAGUI_TYPES_H
! #ifdef SWIG
! %include "swigcommon.h"
! %module paragui_types
! %{
! #include "paragui_types.h"
! %}
! #endif
!
! // Forward declarations
!
! class PG_MessageObject;
! class PG_Widget;
! #ifndef SWIG
! class PG_Rect;
! #endif
!
! //! Structure for a screen point
! typedef struct {
! Sint16 x; //!< screen X-Coordinate
! Sint16 y; //!< screen Y-Coordinate
! } PG_Point;
//! Structure for widget gradients
--- 35,39 ----
#define PARAGUI_TYPES_H
! #include "SDL.h"
//! Structure for widget gradients
***************
*** 61,99 ****
SDL_Color colors[4]; //!< array of gradient colors
} PG_Gradient;
-
- //! ParaGUI message types
- typedef enum {
- // MSG_BUTTONCLICK, //!< a button was pressed
- // MSG_SCROLLPOS, //!< scrollbar changed it's position
- // MSG_SLIDEEND = MSG_SCROLLPOS, //!< slider changed it's position
- // MSG_SCROLLTRACK, //!< scrollbar position changing currently
- // MSG_SLIDE = MSG_SCROLLTRACK, //!< slider position changing currently
- MSG_THREAD_SIGNAL, //!< general appeal signal (can by used for
signal events)
- MSG_SIGNAL, //!< general appeal signal (can by used for signal
events)
- // MSG_QUIT, //!< the appliction's messageloop will quit
- // MSG_EDITBEGIN, //!< a lineedit object entered "edit-mode"
- // MSG_EDITEND, //!< a lineedit object has left "edit-mode"
- // MSG_APPIDLE, //!< fired repeatedly (if enabled) when the event queue
is empty
- // MSG_SELECTITEM, //!< a listbox item has been selected
- // MSG_VIDEORESIZE, //!< the videowindow has been resized by the
user
- // MSG_SPINNER_CHANGE, //!< a spinnerobject changed it's value
- // MSG_WINDOWCLOSE, //!< a window was closed
- // MSG_WINDOWMINIMIZE, //!< a window was minimized
- // MSG_WINDOWRESTORE, //!< a window was restored
- // MSG_RETURN, //!< RETURN/ENTER was pressed in a lineedit widget
- // MSG_MODALQUIT, //!< signal to leave a modal eventloop
- // MSG_SELECTMENUITEM, //!< a menuitem has been selected
- MSG_NOTEBOOK_TAB_CLICK, //!< a notebook tab was clicked
- MSG_USER_1 = 10001, //!< userevent 1
- MSG_USER_2 = 10002, //!< userevent 2
- MSG_USER_3 = 10003, //!< userevent 3
- MSG_USER_4 = 10004, //!< userevent 4
- MSG_USER_5 = 10005, //!< userevent 5
- MSG_USER_6 = 10006, //!< userevent 6
- MSG_USER_7 = 10007, //!< userevent 7
- MSG_USER_8 = 10008, //!< userevent 8
- MSG_USER_9 = 10009, //!< userevent 9
- MSG_USER_10 = 10010 //!< userevent 10
- } PG_MSG_TYPE;
//! Keyevent actions
--- 41,44 ----
Index: pgapplication.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgapplication.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgapplication.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgapplication.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 35,50 ****
#define PG_APPLICATION_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgapplication
- %{
- #include "pgapplication.h"
- %}
- #endif
-
#include "pgmessageobject.h"
#include "pgfilearchive.h"
#include "pgfont.h"
! #include "pgtheme.h"
/**
--- 35,43 ----
#define PG_APPLICATION_H
#include "pgmessageobject.h"
#include "pgfilearchive.h"
#include "pgfont.h"
!
! class PG_Theme;
/**
***************
*** 113,123 ****
@param flags PG_ screen initialization flags
*/
- #ifdef SWIG
- // swig messes up the default arguments
- bool InitScreen(int w, int h, int depth, unsigned int flags);
- #else
-
bool InitScreen(int w, int h, int depth=DISPLAY_DEPTH, Uint32 flags =
SDL_SWSURFACE /* | SDL_FULLSCREEN*/ | SDL_HWPALETTE);
- #endif
/**
--- 106,110 ----
***************
*** 209,218 ****
@return true - background image was altered successfully
*/
- #ifdef SWIG
- %name(SetBackground2) bool SetBackground(SDL_Surface* surface, int
mode=BKMODE_TILE);
- #else
-
bool SetBackground(SDL_Surface* surface, int mode=BKMODE_TILE);
- #endif
/**
--- 196,200 ----
***************
*** 271,277 ****
/** */
- #ifndef SWIG
void PrintVideoTest();
- #endif
/**
--- 253,257 ----
***************
*** 348,354 ****
@return returns non-zero on success or 0 if not succes
*/
- #ifndef SWIG
static bool LoadLayout(const char *name, void (* WorkCallback)(int now,
int max));
- #endif
/**
--- 328,332 ----
***************
*** 359,365 ****
@return returns non-zero on success or 0 if not succes
*/
- #ifndef SWIG
static bool LoadLayout(const char *name, void (* WorkCallback)(int now,
int max), void *UserSpace);
- #endif
/**
--- 337,341 ----
***************
*** 393,401 ****
@return 0 when OK
*/
- #ifdef SWIG
- %name(SetFontColorRGB) static void SetFontColor(int Red, int Green, int
Blue);
- #else
static void SetFontColor(int Red, int Green, int Blue);
- #endif
/**
--- 369,373 ----
***************
*** 404,412 ****
@return 0 when OK
*/
- #ifdef SWIG
- %name(SetFontColor32) static void SetFontColor(int Color);
- #else
static void SetFontColor(int Color);
- #endif
/**
--- 376,380 ----
***************
*** 512,520 ****
private:
- #ifndef SWIG
// disable the copy operators
PG_Application(const PG_Application&);
PG_Application& operator=(const PG_Application&);
- #endif
bool my_freeBackground;
--- 480,486 ----
***************
*** 525,533 ****
static PG_Theme* my_Theme;
-
- #ifndef SWIG
static std::string app_path;
- #endif
-
static PG_Application* pGlobalApp;
static SDL_Surface* screen;
--- 491,495 ----
Index: pgbutton.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgbutton.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgbutton.h 27 Apr 2002 13:58:20 -0000 1.5
--- pgbutton.h 27 Apr 2002 15:36:54 -0000 1.6
***************
*** 35,46 ****
#define PG_BUTTON_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgbutton
- %{
- #include "pgbutton.h"
- %}
- #endif
-
#include "pgwidget.h"
#include <string>
--- 35,38 ----
***************
*** 145,152 ****
void LoadThemeStyle(const char* widgettype);
- #ifndef SWIG
/** */
void LoadThemeStyle(const char* widgettype, const char* objectname);
- #endif
/**
--- 137,142 ----
***************
*** 285,293 ****
private:
- #ifndef SWIG
-
PG_Button(const PG_Button&);
PG_Button& operator=(const PG_Button&);
- #endif
/** */
--- 275,280 ----
Index: pgcheckbutton.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcheckbutton.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgcheckbutton.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgcheckbutton.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 34,45 ****
#define PG_CHECKBUTTON_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgcheckbutton
- %{
- #include "pgcheckbutton.h"
- %}
- #endif
-
#include "pgradiobutton.h"
--- 34,37 ----
Index: pgcolumnitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgcolumnitem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgcolumnitem.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgcolumnitem.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 34,45 ****
#define PG_COLUMNITEM_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgcolumnitem
- %{
- #include "pgcolumnitem.h"
- %}
- #endif
-
#include "pglistboxitem.h"
#include <vector>
--- 34,37 ----
***************
*** 111,118 ****
Uint32 my_columncount;
- #ifndef SWIG
std::vector <Uint32> my_columnwidth;
std::vector <std::string> my_columntext;
- #endif
};
--- 103,108 ----
Index: pgdraw.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgdraw.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgdraw.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgdraw.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 85,89 ****
bool smooth = true);
- #ifndef SWIG
//! Scale an SDL_Surface
/*!
--- 85,88 ----
***************
*** 121,125 ****
static_cast<double>(newy) / src->h, smooth);
}
- #endif
//! Scale and blit surface
--- 120,123 ----
Index: pgdropdown.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgdropdown.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgdropdown.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgdropdown.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 34,45 ****
#define PG_DROPDOWN_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgdropdown
- %{
- #include "pgdropdown.h"
- %}
- #endif
-
#include "pgbutton.h"
#include "pglineedit.h"
--- 34,37 ----
Index: pgfile.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfile.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgfile.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgfile.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 34,45 ****
#define PG_FILE_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgfile
- %{
- #include "pgfile.h"
- %}
- #endif
-
#include "paragui.h"
--- 34,37 ----
***************
*** 80,84 ****
int write(void *buffer, unsigned int bytestowrite);
- #ifndef SWIG
//! write bytes to the stream
/*!
--- 72,75 ----
***************
*** 87,93 ****
*/
int write(std::string &buffer);
- #endif
- #ifndef SWIG
//! write bytes to the stream
/*!
--- 78,82 ----
***************
*** 96,102 ****
*/
int write(const char *buffer);
- #endif
- #ifndef SWIG
/**
read records from the stream
--- 85,89 ----
***************
*** 107,113 ****
*/
int read(void *buffer, unsigned int objSize, unsigned int objCount);
- #endif
- #ifndef SWIG
/**
write records to the stream
--- 94,98 ----
***************
*** 118,122 ****
*/
int write(void *buffer, unsigned int objSize, unsigned int objCount);
- #endif
/**
--- 103,106 ----
***************
*** 148,154 ****
void* file;
- #ifndef SWIG
friend class PG_FileArchive;
- #endif
};
--- 132,136 ----
Index: pgfilearchive.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfilearchive.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgfilearchive.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgfilearchive.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 35,46 ****
#define PG_FILEARCHIVE_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgfilearchive
- %{
- #include "pgfilearchive.h"
- %}
- #endif
-
#include "paragui.h"
#include "pgfile.h"
--- 35,38 ----
Index: pgfont.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgfont.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgfont.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgfont.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 34,47 ****
#define PG_FONT_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgfile
- %{
- #include "pgfont.h"
- %}
- #endif
-
#include "paragui.h"
#include "pgdatacontainer.h"
#include <ft2build.h>
--- 34,40 ----
#define PG_FONT_H
#include "paragui.h"
#include "pgdatacontainer.h"
+ #include "pgrect.h"
#include <ft2build.h>
***************
*** 191,197 ****
*/
static bool RenderText(SDL_Surface *Surface, const PG_Rect& ClipRect,
int BaseLineX, int BaseLineY, const char *Text, PG_Font* ParamIn);
! #ifndef SWIG
static bool RenderText(SDL_Surface *Surface, PG_Rect *ClipRect, int
BaseLineX, int BaseLineY, const char *Text, PG_Font* ParamIn);
- #endif
/**
--- 184,189 ----
*/
static bool RenderText(SDL_Surface *Surface, const PG_Rect& ClipRect,
int BaseLineX, int BaseLineY, const char *Text, PG_Font* ParamIn);
!
static bool RenderText(SDL_Surface *Surface, PG_Rect *ClipRect, int
BaseLineX, int BaseLineY, const char *Text, PG_Font* ParamIn);
/**
***************
*** 223,228 ****
static PG_GlyphCacheItem* GetGlyph(PG_Font *Param, int glyph_index);
- #ifndef SWIG
-
typedef std::map<FT_F26Dot6, PG_FontFaceCacheItem*> MAP_SUBITEMS;
--- 215,218 ----
***************
*** 245,249 ****
friend class PG_Font;
- #endif
};
--- 235,238 ----
Index: pgimage.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgimage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgimage.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgimage.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 34,45 ****
#define PG_IMAGE_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgimage
- %{
- #include "pgimage.h"
- %}
- #endif
-
#include "pgthemewidget.h"
--- 34,37 ----
***************
*** 70,78 ****
@param style widgetstyle to use
*/
- #ifdef SWIG
- %name(PG_ImageSurface) PG_Image(PG_Widget* parent, const PG_Point& p,
SDL_Surface* image, bool freeimage = true, const char* style = "ThemeWidget");
- #else
PG_Image(PG_Widget* parent, const PG_Point& p, SDL_Surface* image, bool
freeimage = true, const char* style = "ThemeWidget");
- #endif
protected:
--- 62,66 ----
Index: pglabel.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglabel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pglabel.h 15 Apr 2002 13:35:35 -0000 1.3
--- pglabel.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 30,41 ****
#define PG_LABEL_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pglabel
- %{
- #include "pglabel.h"
- %}
- #endif
-
#include "pgwidget.h"
#include "pgapplication.h"
--- 30,33 ----
***************
*** 67,85 ****
void LoadThemeStyle(const char* style);
- #ifndef SWIG
/** */
void LoadThemeStyle(const char* widgettype, const char* object);
- #endif
/** Sets text alignment */
void SetAlignment(int a);
- #ifdef SWIG
-
- %name(SetIconFile) SDL_Surface* SetIcon(const char* filename);
- #else
/** */
SDL_Surface* SetIcon(const char* filename);
- #endif
/** */
--- 59,70 ----
***************
*** 106,114 ****
private:
- #ifndef SWIG
PG_Label(const PG_Label&);
PG_Label& operator=(const PG_Label&);
- #endif
int my_alignment;
--- 91,97 ----
Index: pglineedit.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglineedit.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pglineedit.h 27 Apr 2002 11:57:22 -0000 1.4
--- pglineedit.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 30,41 ****
#define PG_LINEEDIT
- #ifdef SWIG
- %include "swigcommon.h"
- %module pglineedit
- %{
- #include "pglineedit.h"
- %}
- #endif
-
#include "pgthemewidget.h"
#include "pgsignals.h"
--- 30,33 ----
***************
*** 64,71 ****
void LoadThemeStyle(const char* widgettype);
- #ifndef SWIG
/** */
void LoadThemeStyle(const char* widgettype, const char* objectname);
- #endif
/** start edit */
--- 56,61 ----
***************
*** 192,200 ****
private:
- #ifndef SWIG
PG_LineEdit(const PG_LineEdit&);
PG_LineEdit& operator=(PG_LineEdit&);
- #endif
void DrawText(const PG_Rect& dst);
--- 182,188 ----
Index: pglistbox.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistbox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pglistbox.h 27 Apr 2002 11:57:22 -0000 1.4
--- pglistbox.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 30,41 ****
#define PG_LISTBOX_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pglistbox
- %{
- #include "pglistbox.h"
- %}
- #endif
-
#include "pgwidgetlist.h"
#include "pglistboxitem.h"
--- 30,33 ----
Index: pglistboxitem.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pglistboxitem.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pglistboxitem.h 15 Apr 2002 13:35:35 -0000 1.3
--- pglistboxitem.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 30,42 ****
#define PG_LISTBOXITEM_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pglistboxitem
- %{
- #include "pglistboxitem.h"
- %}
- #endif
-
-
#include "pglistboxbaseitem.h"
--- 30,33 ----
Index: pgmaskedit.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmaskedit.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgmaskedit.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgmaskedit.h 27 Apr 2002 15:36:54 -0000 1.4
***************
*** 32,46 ****
#include "pglineedit.h"
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgmaskedit
- %{
- #include "pgmaskedit.h"
- %}
- #endif
-
- #ifndef SWIG
#include <string>
- #endif
class DECLSPEC PG_MaskEdit : public PG_LineEdit {
--- 32,36 ----
***************
*** 90,98 ****
private:
- #ifndef SWIG
-
std::string my_mask;
std::string my_displaymask;
- #endif
char my_spacer;
--- 80,85 ----
Index: pgmessagebox.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmessagebox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgmessagebox.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgmessagebox.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 30,41 ****
#define PG_MESSAGEBOX_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgmessagebox
- %{
- #include "pgmessagebox.h"
- %}
- #endif
-
#include "paragui.h"
#include "pgbutton.h"
--- 30,33 ----
***************
*** 65,72 ****
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");
- #ifdef SWIG
-
- %name(PG_MessageBox1) 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");
- #else
/**
Creates a PopUp with 1 Button
--- 57,60 ----
***************
*** 81,85 ****
*/
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");
- #endif
/**
--- 69,72 ----
Index: pgmessageobject.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgmessageobject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgmessageobject.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgmessageobject.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 30,41 ****
#define PG_MESSAGEOBJECT_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgmessageobject
- %{
- #include "pgmessageobject.h"
- %}
- #endif
-
#include "paragui.h"
#include "pgsignals.h"
--- 30,33 ----
***************
*** 271,277 ****
static bool my_quitEventLoop;
- #ifndef SWIG
static std::vector<PG_MessageObject*> objectList;
- #endif
static PG_MessageObject* captureObject;
--- 263,267 ----
***************
*** 283,290 ****
private:
- #ifndef SWIG
PG_MessageObject(const PG_MessageObject&);
PG_MessageObject& operator=(const PG_MessageObject&);
- #endif
bool RemoveObject(PG_MessageObject* obj);
--- 273,278 ----
***************
*** 298,351 ****
bool my_canReceiveMessages;
- #ifndef SWIG
friend class PG_Application;
- #endif
};
-
-
- #ifdef SWIG
-
- // Grab a Python function object as a Python object.
- %typemap(python,in) PyObject *pyfunc {
- if (!PyCallable_Check($source)) {
- PyErr_SetString(PyExc_TypeError, "Need a callable object!");
- return NULL;
- }
- $target = $source;
- }
-
- %addmethods PG_MessageObject {
-
- // This function matches the prototype of the normal C callback
- // function for our widget. However, we use the clientdata pointer
- // for holding a reference to a Python callable object.
-
- static bool PythonCallBack(int id, PG_Widget *widget, unsigned long
data, void *clientdata) {
- PyObject *func, *arglist;
- PyObject *result;
- bool res = 0;
-
- func = (PyObject *) clientdata; // Get Python
function
- arglist = Py_BuildValue("(ill)",id,widget,data);// Build
argument list
- result = PyEval_CallObject(func,arglist); // Call Python
- Py_DECREF(arglist); // Trash arglist
- if (result) { // If no errors,
return double
- res = PyInt_AsLong(result);
- }
- Py_XDECREF(result);
- return res;
- }
-
- // Attach a new method to our plot widget for adding Python functions
- // Set a Python function object as a callback function
- // Note : PyObject *pyfunc is remapped with a typempap
-
- void set_pymethod(PG_MSG_TYPE type, PyObject *pyfunc) {
- self->SetEventCallback(type, PG_MessageObject_PythonCallBack,
(void *) pyfunc);
- Py_INCREF(pyfunc);
- }
- }
-
- #endif
#endif // PG_MESSAGEOBJECT_H
--- 286,291 ----
Index: pgpopupmenu.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgpopupmenu.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgpopupmenu.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgpopupmenu.h 27 Apr 2002 15:36:54 -0000 1.5
***************
*** 31,42 ****
#define PG_POPUPMENU_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgpopupmenu
- %{
- #include "pgpopupmenu.h"
- %}
- #endif
-
#include <string>
#include <list>
--- 31,34 ----
***************
*** 207,211 ****
*/
- #ifndef SWIG
/**
* Adds a menu item whose handler (if any) is set to be a stand-alone
--- 199,202 ----
***************
*** 233,237 ****
PG_PopupMenu *sub,
PG_MenuItem::MI_FLAGS flags =
PG_MenuItem::MIF_SUBMENU);
- #endif // SWIG
/**
--- 224,227 ----
***************
*** 264,270 ****
protected: // methods
- #ifndef SWIG
typedef std::list<PG_MenuItem*>::iterator MII;
- #endif // SWIG
// reimplemented
--- 254,258 ----
***************
*** 294,308 ****
private: // methods
! #ifndef SWIG
bool selectItem(PG_MenuItem *item, MII iter);
bool handleMotion(PG_Point const&);
void appendItem(PG_MenuItem *item);
- #endif //SWIG
protected: // data
! #ifndef SWIG
std::list<PG_MenuItem*> items; /** the menu items collection */
std::string myCaption; /** menu caption */
- #endif //SWIG
SDL_Color captionActiveColor;
--- 282,294 ----
private: // methods
!
bool selectItem(PG_MenuItem *item, MII iter);
bool handleMotion(PG_Point const&);
void appendItem(PG_MenuItem *item);
protected: // data
!
std::list<PG_MenuItem*> items; /** the menu items collection */
std::string myCaption; /** menu caption */
SDL_Color captionActiveColor;
***************
*** 344,348 ****
};
- #ifndef SWIG
inline int PG_PopupMenu::maxItemWidth() const {
return w - xPadding;
--- 330,333 ----
***************
*** 430,435 ****
return myPoint;
}
-
- #endif // SWIG
#endif // PG_POPUPMENU_H
--- 415,418 ----
Index: pgprogressbar.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgprogressbar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgprogressbar.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgprogressbar.h 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 30,41 ****
#define PG_PROGRESSBAR_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgprogressbar
- %{
- #include "pgprogressbar.h"
- %}
- #endif
-
#include "pgthemewidget.h"
--- 30,33 ----
***************
*** 84,92 ****
*/
private:
- #ifndef SWIG
PG_ProgressBar(const PG_ProgressBar&);
PG_ProgressBar& operator=(const PG_ProgressBar&);
- #endif
PG_Gradient my_pbGradient;
--- 76,82 ----
Index: pgradiobutton.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgradiobutton.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgradiobutton.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgradiobutton.h 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 30,41 ****
#define PG_RADIOBUTTON_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgradiobutton
- %{
- #include "pgradiobutton.h"
- %}
- #endif
-
#include "pgthemewidget.h"
#include "pgbutton.h"
--- 30,33 ----
***************
*** 110,118 ****
private:
- #ifndef SWIG
PG_RadioButton(const PG_RadioButton&);
PG_RadioButton& operator=(const PG_RadioButton&);
- #endif
bool my_storeMarker;
--- 102,108 ----
Index: pgrect.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrect.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgrect.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgrect.h 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 30,40 ****
#define PG_RECT_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgrect
- %include "pgrect.h"
- #endif
-
#include "paragui.h"
/**
--- 30,35 ----
#define PG_RECT_H
#include "paragui.h"
+ #include "pgpoint.h"
/**
***************
*** 43,53 ****
*/
- #ifdef SWIG
- typedef struct {
- Sint16 x, y;
- Uint16 w, h;
- } SDL_Rect;
- #endif // SWIG
-
class DECLSPEC PG_Rect : public SDL_Rect {
public:
--- 38,41 ----
***************
*** 98,102 ****
void SetRect(Sint16 nx, Sint16 ny, Uint16 nw, Uint16 nh);
- #ifndef SWIG
/**
*/
--- 86,89 ----
***************
*** 118,123 ****
}
- #endif
-
/**
Check if a given point is inside a rectangle (boxtest)
--- 105,108 ----
***************
*** 130,134 ****
}
- #ifndef SWIG
/**
Intersect two rectangles
--- 115,118 ----
***************
*** 138,142 ****
*/
static PG_Rect IntersectRect(const PG_Rect& p, const PG_Rect& c);
- #endif
/**
--- 122,125 ----
***************
*** 172,180 ****
\return true if the rectangles overlap, false otherwise
*/
- #ifndef SWIG
inline bool OverlapRect(const PG_Rect& p, const PG_Rect& c) {
return !( (p.x + p.w < c.x) || (p.x > c.x + c.w) || (p.y + p.h
< c.y) || (p.y > c.y + c.h) || (p.IntersectRect(c).IsNull()) );
}
- #endif
//! Check if this rectangle overlap another one
--- 155,161 ----
***************
*** 187,191 ****
}
- #ifndef SWIG
//! Check if this rectangle overlap another one
/*!
--- 168,171 ----
***************
*** 196,209 ****
return OverlapRect(*p, *this);
}
- #endif
SDL_Rect* SDLRect();
- #ifndef SWIG
Sint16& my_xpos;
Sint16& my_ypos;
Uint16& my_width;
Uint16& my_height;
- #endif
};
--- 176,186 ----
Index: pgrectlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgrectlist.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgrectlist.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgrectlist.h 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 38,41 ****
--- 38,44 ----
#include <map>
#endif
+
+ class PG_Widget;
+
/**
@author Alexander Pipelka
Index: pgscrollbar.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgscrollbar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgscrollbar.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgscrollbar.h 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 30,41 ****
#define PG_SCROLLBAR_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgscrollbar
- %{
- #include "pgscrollbar.h"
- %}
- #endif
-
#include "pgwidget.h"
#include "pgbutton.h"
--- 30,33 ----
***************
*** 55,59 ****
protected:
- #ifndef SWIG
#ifndef DOXYGEN_SKIP
class ScrollButton : public PG_Button {
--- 47,50 ----
***************
*** 89,93 ****
};
#endif // DOXYGEN_SKIP
- #endif // SWIG
--- 80,83 ----
***************
*** 161,176 ****
int id;
- #ifndef SWIG
-
friend class ScrollButton;
- #endif
private:
- #ifndef SWIG
-
PG_ScrollBar(const PG_ScrollBar&);
PG_ScrollBar& operator=(PG_ScrollBar&);
- #endif
};
--- 151,160 ----
Index: pgslider.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgslider.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgslider.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgslider.h 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 30,41 ****
#define PG_SLIDER_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgslider
- %{
- #include "pgslider.h"
- %}
- #endif
-
#include "paragui.h"
#include "pgscrollbar.h"
--- 30,33 ----
Index: pgspinnerbox.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgspinnerbox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgspinnerbox.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgspinnerbox.h 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 30,41 ****
#define PG_SPINNERBOX_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgspinnerbox
- %{
- #include "pgspinnerbox.h"
- %}
- #endif
-
#include "pgmaskedit.h"
#include "pgbutton.h"
--- 30,33 ----
Index: pgtheme.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgtheme.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgtheme.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgtheme.h 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 30,40 ****
#define PG_THEME_H
- #ifdef SWIG
- %module theme
- %{
- #include "pgtheme.h"
- %}
- #endif
-
#include "paragui.h"
--- 30,33 ----
Index: pgthemewidget.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgthemewidget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgthemewidget.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgthemewidget.h 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 30,41 ****
#define PG_THEMEWIDGET_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgthemewidget
- %{
- #include "pgthemewidget.h"
- %}
- #endif
-
#include "pgwidget.h"
--- 30,33 ----
***************
*** 99,107 ****
/**
- */
- #ifdef SWIG
- %name(PG_ThemeWidgetEx) PG_ThemeWidget(PG_Widget* parent, const
PG_Rect& r, bool bCreateSurface, const char* style="ThemeWidget");
- #else
- /**
Create a new PG_ThemeWidget object
@param parent Pointer to parent widget
--- 91,94 ----
***************
*** 115,119 ****
*/
PG_ThemeWidget(PG_Widget* parent, const PG_Rect& r, bool
bCreateSurface, const char* style="ThemeWidget");
- #endif
/**
--- 102,105 ----
***************
*** 127,133 ****
void LoadThemeStyle(const char* widgettype);
- #ifndef SWIG
void LoadThemeStyle(const char* widgettype, const char* objectname);
- #endif
/**
--- 113,117 ----
***************
*** 136,145 ****
@param mode BKMODE_TILE | BKMODE_STRETCH
*/
- /** */
- #ifdef SWIG
- %name(SetBackgroundFile) bool SetBackground(const char* filename, int
mode=BKMODE_TILE);
- #else
bool SetBackground(const char* filename, int mode=BKMODE_TILE);
- #endif
--- 120,124 ----
***************
*** 150,159 ****
@param mode BKMODE_TILE | BKMODE_STRETCH
*/
- /** */
- #ifdef SWIG
- %name(SetBackgroundColorKey) bool SetBackground(const char* filename,
int mode, Uint32 colorkey);
- #else
bool SetBackground(const char* filename, int mode, Uint32 colorkey);
- #endif
/**
--- 129,133 ----
***************
*** 253,260 ****
private:
- #ifndef SWIG
PG_ThemeWidget(const PG_ThemeWidget&);
PG_ThemeWidget& operator=(const PG_ThemeWidget&);
- #endif
void Init(const char* style);
--- 227,232 ----
Index: pgwidget.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidget.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgwidget.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgwidget.h 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 30,41 ****
#define PG_WIDGET_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgwidget
- %{
- #include "pgwidget.h"
- %}
- #endif
-
#include "pgmessageobject.h"
#include "pgrectlist.h"
--- 30,33 ----
***************
*** 99,108 ****
@param bObjectSurface flag if a surface for the object should be
created
*/
- #ifdef SWIG
- %name(PG_WidgetEx) PG_Widget(PG_Widget* parent, const PG_Rect& rect,
bool bObjectSurface);
- #else
-
PG_Widget(PG_Widget* parent, const PG_Rect& rect, bool bObjectSurface);
- #endif
/**
--- 91,95 ----
***************
*** 122,126 ****
void LoadThemeStyle(const char* widgettype);
- #ifndef SWIG
/**
Load a style from the theme definition
--- 109,112 ----
***************
*** 132,136 ****
*/
virtual void LoadThemeStyle(const char* widgettype, const char*
objectnmae);
- #endif
/**
--- 118,121 ----
***************
*** 147,151 ****
@param y y-position
*/
! void WidgetDrag(int x, int y);
/**
--- 132,136 ----
@param y y-position
*/
! void WidgetDrag(Sint16 x, Sint16 y);
/**
***************
*** 166,182 ****
This function moves the widget
*/
! bool MoveWidget(int x, int y);
!
! /**
! Move a widget -- OBSOLETE
!
! @param x new x-position (in parent context)
! @param y new y-position (in parent context)
! @return function succeeded
!
! This function moves the widget.
! CAUTION: This function will be removed in the final version. Please use
MoveWidget(int x, int y)
! */
! bool MoveWindow(int x, int y);
/**
--- 151,155 ----
This function moves the widget
*/
! bool MoveWidget(Sint16 x, Sint16 y);
/**
***************
*** 188,223 ****
This function moves and resizes the widget to fit the given rectangle.
*/
- #ifdef SWIG
- %name(MoveWidgetRect) bool MoveWindow(const PG_Rect& r);
- #else
bool MoveWidget(const PG_Rect& r);
- #endif
-
- /**
- Move and resize widget -- OBSOLETE
-
- @param r new widget rectangle (client coordinates)
- @return function succeeded
-
- This function moves and resizes the widget to fit the given rectangle.
- CAUTION: This function will be removed in the final version. Please use
MoveWidget(const PG_Rect& r)
- */
- #ifdef SWIG
- %name(MoveWindowRect) bool MoveWindow(const PG_Rect& r);
- #else
- bool MoveWindow(const PG_Rect& r);
- #endif
-
- /**
- Resize a widget -- OBSOLETE
-
- @param w new widget-width
- @param w new widget-height
- @return function succeeded
-
- This function resizes the widget. This member function will be removed
in the final version.
- Please use SizeWidget().
- */
- virtual bool SizeWindow(Uint16 w, Uint16 h);
/**
--- 161,165 ----
***************
*** 316,324 ****
@return A pointer to the child with the given ID or 0 if no such child
exists.
*/
- #ifdef SWIG
- %name (FindChildID) PG_Widget* FindChild(int id);
- #else
PG_Widget* FindChild(int id);
- #endif
/**
--- 258,262 ----
***************
*** 448,452 ****
/** */
! void MoveRect(int x, int y);
/** */
--- 386,390 ----
/** */
! void MoveRect(Sint16 x, Sint16 y);
/** */
***************
*** 492,498 ****
@return returns non-zero on success or 0 if not succes
*/
- #ifndef SWIG
bool LoadLayout(const char *name, void (* WorkCallback)(int now, int
max));
- #endif
/**
--- 430,434 ----
***************
*** 503,509 ****
@return returns non-zero on success or 0 if not succes
*/
- #ifndef SWIG
bool LoadLayout(const char *name, void (* WorkCallback)(int now, int
max), void *UserSpace);
- #endif
/**
--- 439,443 ----
***************
*** 552,556 ****
void AddText(const char* text, bool update = false);
- #ifndef SWIG
/**
Sets formated text
--- 486,489 ----
***************
*** 558,562 ****
*/
virtual void SetTextFormat(const char* text, ...);
- #endif
/** Returns text
--- 491,494 ----
***************
*** 567,575 ****
void GetTextSize(Uint16& w, Uint16& h, const char* text = NULL);
- #ifdef SWIG
- %name(GetTextSize2) static void GetTextSize(Uint16& w, Uint16& h, const
char* text, PG_Font* font);
- #else
static void GetTextSize(Uint16& w, Uint16& h, const char* text,
PG_Font* font);
- #endif
int GetTextWidth();
--- 499,503 ----
***************
*** 599,607 ****
@param Blue Blue color value 0 - 255
*/
- #ifdef SWIG
- %name(SetFontColorRGB) void SetFontColor(int Red, int Green, int Blue);
- #else
void SetFontColor(int Red, int Green, int Blue);
- #endif
/**
--- 527,531 ----
***************
*** 609,617 ****
@param Color Value of the color 0x00RRGGBB (RGB)
*/
- #ifdef SWIG
- %name(SetFontColor32) void SetFontColor(int Color);
- #else
void SetFontColor(int Color);
- #endif
/**
--- 533,537 ----
***************
*** 688,696 ****
@param text pointer to text string
*/
- #ifdef SWIG
- %name(DrawTextXY) void DrawText(int x, int y, const char* text);
- #else
void DrawText(int x, int y, const char* text);
- #endif
/**
--- 608,612 ----
***************
*** 701,709 ****
@param cliprect text bounding rectangle
*/
- #ifdef SWIG
- %name(DrawTextXYClip) void DrawText(int x, int y, const char* text,
const PG_Rect& cliprect);
- #else
void DrawText(int x, int y, const char* text, const PG_Rect& cliprect);
- #endif
/**
--- 617,621 ----
***************
*** 713,721 ****
@param color color of the rendered text
*/
- #ifdef SWIG
- %name(DrawTextColor) void DrawText(const PG_Rect& rect, const char*
text, const SDL_Color& c);
- #else
void DrawText(const PG_Rect& rect, const char* text, const SDL_Color&
c);
- #endif
/**
--- 625,629 ----
***************
*** 726,734 ****
@param color color of the rendered text
*/
- #ifdef SWIG
- %name(DrawTextXYColor) void DrawText(int x, int y, const char* text,
const SDL_Color& c);
- #else
void DrawText(int x, int y, const char* text, const SDL_Color& c);
- #endif
/** */
--- 634,638 ----
***************
*** 771,778 ****
void GetClipRects(PG_Rect& src, PG_Rect& dst);
- #ifndef SWIG
/** */
void GetClipRects(PG_Rect& src, PG_Rect& dst, const PG_Rect&
displayrect);
- #endif
/** */
--- 675,680 ----
***************
*** 848,862 ****
MoveWidget events.
*/
! virtual void eventMoveWidget(int x, int y);
!
! /**
! Callback for the MoveWidget event -- OBSOLETE
! @param x new x position
! @param y new y position
! This virtual function can be used to implement custom behavior for
! MoveWidget events.
! CAUTION: This function will be removed in the final version
! */
! virtual void eventMoveWindow(int x, int y);
/**
--- 750,754 ----
MoveWidget events.
*/
! virtual void eventMoveWidget(Sint16 x, Sint16 y);
/**
***************
*** 870,883 ****
/**
- Callback for the SizeWidget event
- @param w new width
- @param h new height
- This virtual function can be used to implement custom behavior for
- SizeWidget events.
- CAUTION: This function will be removed in the final version
- */
- virtual void eventSizeWindow(Uint16 w, Uint16 h);
-
- /**
overridable eventhandler to draw the object surface
@param surface the widgets drawing surface.
--- 762,765 ----
***************
*** 957,964 ****
void AddChildToCache(PG_Widget *child, int id);
- #ifndef SWIG
PG_Widget(const PG_Widget&);
PG_Widget& operator=(const PG_Widget&);
- #endif
static bool bBulkUpdate;
--- 839,844 ----
Index: pgwidgetdnd.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidgetdnd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgwidgetdnd.h 15 Apr 2002 13:35:35 -0000 1.3
--- pgwidgetdnd.h 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 30,41 ****
#define PG_WIDGETDND_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgwidgetdnd
- %{
- #include "pgwidgetdnd.h"
- %}
- #endif
-
#include "pgwidget.h"
--- 30,33 ----
***************
*** 57,68 ****
PG_WidgetDnD(PG_Widget* parent, int dndID, const PG_Rect& r);
- #ifdef SWIG
-
- %name(PG_WidgetDnDEx) PG_WidgetDnD(PG_Widget* parent, int dndID, const
PG_Rect& r, bool bCreateSurface);
- #else
/**
*/
PG_WidgetDnD(PG_Widget* parent, int dndID, const PG_Rect& r, bool
bCreateSurface);
- #endif
/**
--- 49,55 ----
***************
*** 150,158 ****
private: // disable the copy operators
- #ifndef SWIG
PG_WidgetDnD(const PG_WidgetDnD&);
PG_WidgetDnD& operator=(const PG_WidgetDnD&);
- #endif
};
--- 137,143 ----
Index: pgwidgetlist.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwidgetlist.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgwidgetlist.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgwidgetlist.h 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 30,41 ****
#define PG_WIDGETLIST_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgwidgetlist
- %{
- #include "pgwidgetlist.h"
- %}
- #endif
-
#include "pgthemewidget.h"
#include "pgscrollbar.h"
--- 30,33 ----
***************
*** 147,155 ****
@param index
*/
- #ifdef SWIG
- %name(ScrollToIndex) void ScrollTo(int index, int direction =
PG_SB_VERTICAL);
- #else
void ScrollTo(int index, int direction = PG_SB_VERTICAL);
- #endif
protected:
--- 139,143 ----
***************
*** 194,202 ****
int my_heightHorizontalScrollbar;
- /** swig doesn't understand vectors... */
- #ifndef SWIG
-
std::vector < PG_Widget* > my_widgetList; // Hmmm, I know about this:
vector :))
- #endif
int my_widgetCount;
--- 182,186 ----
***************
*** 211,218 ****
private:
! #ifndef SWIG
PG_WidgetList(const PG_WidgetList&);
PG_WidgetList& operator=(const PG_WidgetList&);
- #endif
PG_WidgetListDataInternal* my_internaldata;
--- 195,201 ----
private:
!
PG_WidgetList(const PG_WidgetList&);
PG_WidgetList& operator=(const PG_WidgetList&);
PG_WidgetListDataInternal* my_internaldata;
Index: pgwindow.h
===================================================================
RCS file: /cvsroot/paragui/paragui/include/pgwindow.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgwindow.h 27 Apr 2002 11:57:22 -0000 1.4
--- pgwindow.h 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 30,41 ****
#define PG_WINDOW_H
- #ifdef SWIG
- %include "swigcommon.h"
- %module pgwindow
- %{
- #include "pgwindow.h"
- %}
- #endif
-
#include "pgthemewidget.h"
#include "pgbutton.h"
--- 30,33 ----
***************
*** 70,78 ****
void LoadThemeStyle(const char* widgettype);
- #ifdef SWIG
- %name(SetColorTitleBar32) void SetColorTitlebar(Uint32 color);
- #else
void SetColorTitlebar(Uint32 color);
- #endif
void SetColorTitlebar(const SDL_Color& c);
--- 62,66 ----
***************
*** 126,133 ****
private: // disable the copy operators
! #ifndef SWIG
PG_Window(const PG_Window&);
PG_Window& operator=(const PG_Window&);
- #endif
};
--- 114,120 ----
private: // disable the copy operators
!
PG_Window(const PG_Window&);
PG_Window& operator=(const PG_Window&);
};
--- pgbuttongroup.h DELETED ---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/include Makefile.am,1.2,1.3 paraconfig.h,1.3,1.4 paragui.h,1.4,1.5 paragui_types.h,1.4,1.5 pgapplication.h,1.4,1.5 pgbutton.h,1.5,1.6 pgcheckbutton.h,1.4,1.5 pgcolumnitem.h,1.3,1.4 pgdraw.h,1.3,1.4 pgdropdown.h,1.4,1.5 pgfile.h,1.3,1.4 pgfilearchive.h,1.3,1.4 pgfont.h,1.3,1.4 pgimage.h,1.3,1.4 pglabel.h,1.3,1.4 pglineedit.h,1.4,1.5 pglistbox.h,1.4,1.5 pglistboxitem.h,1.3,1.4 pgmaskedit.h,1.3,1.4 pgmessagebox.h,1.4,1.5 pgmessageobject.h,1.4,1.5 pgpopupmenu.h,1.4,1.5 pgprogressbar.h,1.3,1.4 pgradiobutton.h,1.4,1.5 pgrect.h,1.3,1.4 pgrectlist.h,1.3,1.4 pgscrollbar.h,1.4,1.5 pgslider.h,1.4,1.5 pgspinnerbox.h,1.4,1.5 pgtheme.h,1.3,1.4 pgthemewidget.h,1.3,1.4 pgwidget.h,1.4,1.5 pgwidgetdnd.h,1.3,1.4 pgwidgetlist.h,1.4,1.5 pgwindow.h,1.4,1.5 pgbuttongroup.h,1.3,NONE,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.5,1.6 pglabel.cpp,1.3,1.4 pglineedit.cpp,1.4,1.5 pglistboxitem.cpp,1.5,1.6 pgpopupmenu.cpp,1.4,1.5 pgprogressbar.cpp,1.3,1.4 pgradiobutton.cpp,1.4,1.5 pgslider.cpp,1.4,1.5 pgthemewidget.cpp,1.3,1.4 pgwidget.cpp,1.5,1.6 pgwindow.cpp,1.4,1.5 pgbuttongroup.cpp,1.3,NONE
- Next by Date:
[paragui-cvs] CVS: paragui/bindings .cvsignore,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE
- Previous by thread:
[paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.5,1.6 pglabel.cpp,1.3,1.4 pglineedit.cpp,1.4,1.5 pglistboxitem.cpp,1.5,1.6 pgpopupmenu.cpp,1.4,1.5 pgprogressbar.cpp,1.3,1.4 pgradiobutton.cpp,1.4,1.5 pgslider.cpp,1.4,1.5 pgthemewidget.cpp,1.3,1.4 pgwidget.cpp,1.5,1.6 pgwindow.cpp,1.4,1.5 pgbuttongroup.cpp,1.3,NONE
- Next by thread:
[paragui-cvs] CVS: paragui/bindings .cvsignore,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE
- Index(es):