root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : xvaga
Ricompilazione Demo : [ ]
Commento            :
Soppressa vecchia MAKE_COLOR e sostiutita con XVT_MAKE_COLOR


git-svn-id: svn://10.65.10.50/trunk@17416 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-10-10 15:13:01 +00:00
parent 40e8db56c2
commit 804b026d54
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xvaga/xvt_defs.h
View File

@ -5,7 +5,7 @@
* Agreement with XVT Software. * Agreement with XVT Software.
* *
* $RCSfile: xvt_defs.h,v $ * $RCSfile: xvt_defs.h,v $
* $Revision: 1.9 $ * $Revision: 1.10 $
* *
* Purpose: Global XVT macro definitions. * Purpose: Global XVT macro definitions.
* *
@ -245,6 +245,14 @@
#define CTL_FLAG_CENTER_JUST 0x00004000L /* centered text */ #define CTL_FLAG_CENTER_JUST 0x00004000L /* centered text */
#define CTL_FLAG_RIGHT_JUST 0x00008000L /* right justified text */ #define CTL_FLAG_RIGHT_JUST 0x00008000L /* right justified text */
#define CTL_FLAG_PASSWORD 0x00010000L #define CTL_FLAG_PASSWORD 0x00010000L
/* Notebk specific flags */
#define CTL_FLAG_TAB_SQUARE 0x00000000L /* default */
#define CTL_FLAG_TAB_ROUND 0x00020000L
#define CTL_FLAG_TAB_DEFAULT 0x00000000L /* default */
#define CTL_FLAG_TAB_BOTTOM 0x00100000L
#define CTL_FLAG_TAB_LEFT 0x00200000L
#define CTL_FLAG_TAB_RIGHT 0x00400000L
#define CTL_FLAG_TAB_TOP 0x00800000L
#define WSF_NONE 0x00000000L #define WSF_NONE 0x00000000L
#define WSF_SIZE 0x00000001L /* is user sizeable */ #define WSF_SIZE 0x00000001L /* is user sizeable */
@ -347,14 +355,6 @@
#define XVT_COLOR_GET_GREEN(color) ((unsigned char)(((color) >> 8) & 0xFF)) #define XVT_COLOR_GET_GREEN(color) ((unsigned char)(((color) >> 8) & 0xFF))
#define XVT_COLOR_GET_BLUE(color) ((unsigned char)((color) & 0xFF)) #define XVT_COLOR_GET_BLUE(color) ((unsigned char)((color) & 0xFF))
/* old MAKE_COLOR macro */
#define MAKE_COLOR(r,g,b) XVT_MAKE_COLOR(r,g,b)
/* Do not use the following, obsoleted macros */
#define XVT_RED_OF_COLOR(color) ((unsigned char)(((color) >> 16) & 0xFF))
#define XVT_GREEN_OF_COLOR(color) ((unsigned char)(((color) >> 8) & 0xFF))
#define XVT_BLUE_OF_COLOR(color) ((unsigned char)((color) & 0xFF))
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
File attributes File attributes
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/

16
xvaga/xvtctl.cpp
View File

@ -592,10 +592,24 @@ int TwxNoteBook::ChangeSelection(size_t tab_no)
long TwxNoteBook::Flags2Style(long flags) const long TwxNoteBook::Flags2Style(long flags) const
{ {
long style = wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS; long style = wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS;
if (flags & CTL_FLAG_CENTER_JUST) bool bottom = false;
#if wxCHECK_VERSION(2,8,9)
if (flags & (CTL_FLAG_TAB_TOP|CTL_FLAG_TAB_BOTTOM|CTL_FLAG_TAB_LEFT|CTL_FLAG_TAB_RIGHT))
{
bottom = (flags & CTL_FLAG_TAB_BOTTOM) != 0;
}
else
#endif
{
bottom = (flags & CTL_FLAG_CENTER_JUST) != 0;
}
if (bottom)
style |= wxAUI_NB_BOTTOM; style |= wxAUI_NB_BOTTOM;
else else
style |= wxAUI_NB_TOP; style |= wxAUI_NB_TOP;
return style; return style;
} }

2
xvaga/xvtwin.h
View File

@ -225,7 +225,7 @@ const wxIcon& _GetIconResource(int rid);
const wxBitmap& _GetToolResource(int rid, int size); const wxBitmap& _GetToolResource(int rid, int size);
#define CAST_COLOR(xc, wc) wxColour wc((xc>>16)&0xFF, (xc>>8)&0xFF, xc&0xFF) #define CAST_COLOR(xc, wc) wxColour wc((xc>>16)&0xFF, (xc>>8)&0xFF, xc&0xFF)
#define MAKE_XVT_COLOR(wc) MAKE_COLOR(wc.Red(), wc.Green(), wc.Blue()) #define MAKE_XVT_COLOR(wc) XVT_MAKE_COLOR(wc.Red(), wc.Green(), wc.Blue())
wxRect NormalizeRCT(const RCT* prct); wxRect NormalizeRCT(const RCT* prct);
#ifdef XVTWIN_CPP #ifdef XVTWIN_CPP