[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/widgets pgbutton.cpp,1.5,1.6 pglabel.cpp,
From: |
Alexander Pipelka <address@hidden> |
Subject: |
[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 |
Date: |
Sat, 27 Apr 2002 11:36:58 -0400 |
Update of /cvsroot/paragui/paragui/src/widgets
In directory subversions:/tmp/cvs-serv11267/src/widgets
Modified Files:
pgbutton.cpp pglabel.cpp pglineedit.cpp pglistboxitem.cpp
pgpopupmenu.cpp pgprogressbar.cpp pgradiobutton.cpp
pgslider.cpp pgthemewidget.cpp pgwidget.cpp pgwindow.cpp
Removed Files:
pgbuttongroup.cpp
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: pgbutton.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgbutton.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgbutton.cpp 27 Apr 2002 13:58:20 -0000 1.5
--- pgbutton.cpp 27 Apr 2002 15:36:55 -0000 1.6
***************
*** 32,35 ****
--- 32,36 ----
#include "pglog.h"
#include "pgdraw.h"
+ #include "pgtheme.h"
struct PG_ButtonDataInternal {
***************
*** 217,225 ****
);
! SetTransparency(
! t->FindProperty(widgettype, objectname, "transparency0"),
! t->FindProperty(widgettype, objectname, "transparency1"),
! t->FindProperty(widgettype, objectname, "transparency2")
! );
s = t->FindString(widgettype, objectname, "label");
--- 218,228 ----
);
! int t0 = t->FindProperty(widgettype, objectname, "transparency0");
! int t1 = t->FindProperty(widgettype, objectname, "transparency1");
! int t2 = t->FindProperty(widgettype, objectname, "transparency2");
!
! if(t0 != -1 && t1 != -1 && t2 != -1) {
! SetTransparency((Uint8)t0, (Uint8)t1, (Uint8)t2);
! }
s = t->FindString(widgettype, objectname, "label");
Index: pglabel.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglabel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pglabel.cpp 15 Apr 2002 13:35:36 -0000 1.3
--- pglabel.cpp 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 27,32 ****
*/
- #include "paragui.h"
#include "pglabel.h"
PG_Label::PG_Label(PG_Widget* parent, const PG_Rect& r, const char* text,
const char* style) :
--- 27,32 ----
*/
#include "pglabel.h"
+ #include "pgtheme.h"
PG_Label::PG_Label(PG_Widget* parent, const PG_Rect& r, const char* text,
const char* style) :
Index: pglineedit.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglineedit.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pglineedit.cpp 27 Apr 2002 11:57:23 -0000 1.4
--- pglineedit.cpp 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 29,32 ****
--- 29,33 ----
#include "pglineedit.h"
#include "pgapplication.h"
+ #include "pgtheme.h"
#include <cstring>
#include <stdarg.h>
Index: pglistboxitem.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglistboxitem.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pglistboxitem.cpp 26 Apr 2002 12:43:23 -0000 1.5
--- pglistboxitem.cpp 27 Apr 2002 15:36:55 -0000 1.6
***************
*** 29,32 ****
--- 29,33 ----
#include "pglistboxitem.h"
#include "pglistbox.h"
+ #include "pgtheme.h"
PG_ListBoxItem::PG_ListBoxItem(int height, const char* text, SDL_Surface*
icon, void* userdata, const char* style) : PG_ListBoxBaseItem(height, userdata)
{
Index: pgpopupmenu.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgpopupmenu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgpopupmenu.cpp 27 Apr 2002 11:57:23 -0000 1.4
--- pgpopupmenu.cpp 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 35,40 ****
#include "pgpopupmenu.h"
#include "pglog.h"
!
! using namespace std;
/***********************************
--- 35,39 ----
#include "pgpopupmenu.h"
#include "pglog.h"
! #include "pgtheme.h"
/***********************************
Index: pgprogressbar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgprogressbar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgprogressbar.cpp 15 Apr 2002 13:35:36 -0000 1.3
--- pgprogressbar.cpp 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 32,35 ****
--- 32,36 ----
#include "pgprogressbar.h"
#include "pgdraw.h"
+ #include "pgtheme.h"
PG_ProgressBar::PG_ProgressBar(PG_Widget* parent, const PG_Rect& r, const
char* style) : PG_ThemeWidget(parent, r) {
Index: pgradiobutton.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgradiobutton.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgradiobutton.cpp 27 Apr 2002 11:57:23 -0000 1.4
--- pgradiobutton.cpp 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 27,32 ****
*/
- #include <stdarg.h>
#include "pgradiobutton.h"
PG_RadioButton::PG_RadioButton(PG_Widget* parent, int id, const PG_Rect& r,
const char* text, PG_RadioButton* firstOfGroup, const char* style) :
PG_ThemeWidget(parent, r) {
--- 27,33 ----
*/
#include "pgradiobutton.h"
+ #include "pgtheme.h"
+ #include <stdarg.h>
PG_RadioButton::PG_RadioButton(PG_Widget* parent, int id, const PG_Rect& r,
const char* text, PG_RadioButton* firstOfGroup, const char* style) :
PG_ThemeWidget(parent, r) {
Index: pgslider.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgslider.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgslider.cpp 27 Apr 2002 11:57:23 -0000 1.4
--- pgslider.cpp 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 29,32 ****
--- 29,33 ----
#include "pgslider.h"
#include "pgapplication.h"
+ #include "pgtheme.h"
PG_Slider::PG_Slider(PG_Widget* parent, int id, const PG_Rect& r, int
direction, const char* style) : PG_ScrollBar(parent, id, r, direction) {
Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgthemewidget.cpp 15 Apr 2002 13:35:36 -0000 1.3
--- pgthemewidget.cpp 27 Apr 2002 15:36:55 -0000 1.4
***************
*** 31,34 ****
--- 31,35 ----
#include "pgapplication.h"
#include "pglog.h"
+ #include "pgtheme.h"
static PG_SurfaceCache my_SurfaceCache;
Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pgwidget.cpp 27 Apr 2002 11:57:23 -0000 1.5
--- pgwidget.cpp 27 Apr 2002 15:36:55 -0000 1.6
***************
*** 36,39 ****
--- 36,40 ----
#include "pgdraw.h"
#include "pglayout.h"
+ #include "pgtheme.h"
bool PG_Widget::bBulkUpdate = false;
***************
*** 387,396 ****
}
! /** */
! bool PG_Widget::MoveWindow(int x, int y) {
! return MoveWidget(x, y);
! }
!
! bool PG_Widget::MoveWidget(int x, int y) {
if (GetParent() != NULL) {
--- 388,392 ----
}
! bool PG_Widget::MoveWidget(Sint16 x, Sint16 y) {
if (GetParent() != NULL) {
***************
*** 467,474 ****
}
- bool PG_Widget::MoveWindow(const PG_Rect& r) {
- return MoveWidget(r);
- }
-
bool PG_Widget::MoveWidget(const PG_Rect& r) {
MoveWidget(r.x, r.y);
--- 463,466 ----
***************
*** 477,484 ****
}
- bool PG_Widget::SizeWindow(Uint16 w, Uint16 h) {
- return SizeWidget(w, h);
- }
-
bool PG_Widget::SizeWidget(Uint16 w, Uint16 h) {
bool v = IsVisible();
--- 469,472 ----
***************
*** 504,508 ****
}
- eventSizeWindow(w, h);
eventSizeWidget(w, h);
--- 492,495 ----
***************
*** 736,740 ****
/** */
! void PG_Widget::MoveRect(int x, int y) {
int dx = x - my_xpos;
int dy = y - my_ypos;
--- 723,727 ----
/** */
! void PG_Widget::MoveRect(Sint16 x, Sint16 y) {
int dx = x - my_xpos;
int dy = y - my_ypos;
***************
*** 760,764 ****
}
- eventMoveWindow(x, y);
eventMoveWidget(x, y);
}
--- 747,750 ----
***************
*** 907,911 ****
}
! void PG_Widget::WidgetDrag(int x, int y) {
x -= my_internaldata->ptDragStart.x;
--- 893,897 ----
}
! void PG_Widget::WidgetDrag(Sint16 x, Sint16 y) {
x -= my_internaldata->ptDragStart.x;
***************
*** 1751,1761 ****
}
! void PG_Widget::eventMoveWidget(int x, int y) {
! }
!
! void PG_Widget::eventMoveWindow(int x, int y) {
! }
!
! void PG_Widget::eventSizeWindow(Uint16 w, Uint16 h) {
}
--- 1737,1741 ----
}
! void PG_Widget::eventMoveWidget(Sint16 x, Sint16 y) {
}
Index: pgwindow.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwindow.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pgwindow.cpp 27 Apr 2002 11:57:23 -0000 1.4
--- pgwindow.cpp 27 Apr 2002 15:36:55 -0000 1.5
***************
*** 29,32 ****
--- 29,33 ----
#include "pgwindow.h"
#include "pgapplication.h"
+ #include "pgtheme.h"
#include <cstring>
--- pgbuttongroup.cpp DELETED ---
[Prev in Thread] |
Current Thread |
[Next in 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,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/test configure.in,1.2,1.3 dblbuffer.cpp,1.2,1.3 paratest.cpp,1.4,1.5
- Next by Date:
[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
- Previous by thread:
[paragui-cvs] CVS: paragui/test configure.in,1.2,1.3 dblbuffer.cpp,1.2,1.3 paratest.cpp,1.4,1.5
- Next by 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
- Index(es):