diff options
Diffstat (limited to 'app/wlib/mswlib/mswint.h')
| -rw-r--r-- | app/wlib/mswlib/mswint.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/app/wlib/mswlib/mswint.h b/app/wlib/mswlib/mswint.h index 2311415..e560053 100644 --- a/app/wlib/mswlib/mswint.h +++ b/app/wlib/mswlib/mswint.h @@ -1,6 +1,7 @@ #include "wlib.h" #include "mswlib.h" -#include "dynarr.h" +//#include "dynarr.h" +#include "common.h" #ifndef WIN32 /*#define CONTROL3D*/ #endif @@ -38,7 +39,9 @@ #define WSCROLL_PARAM_HWND HIWORD(lParam) #endif -#define CAST_AWAY_CONST (char *) +#ifndef CAST_AWAY_CONST + #define CAST_AWAY_CONST (char *) +#endif #define BOOL_T wBool_t #define POS_T wPos_t @@ -122,16 +125,24 @@ struct wDraw_t { double DPI; wDrawRedrawCallBack_p drawRepaint; wDrawActionCallBack_p action; - HBITMAP hBm; + HBITMAP hBmMain; + HBITMAP hBmTemp; + HBITMAP hBmOld; HPEN hPen; HBRUSH hBrush; wDraw_p drawNext; - HBITMAP hBmOld; wBool_t hasPalette; int paletteClock; HBITMAP hBmBackup; HDC hDcBackup; HBITMAP hBmBackupOld; + void *background; + wBool_t bTempMode; + wBool_t bCopiedMain; + + wPos_t lastX; + wPos_t lastY; + }; extern HINSTANCE mswHInst; @@ -147,6 +158,7 @@ extern wDrawColor wDrawColorWhite; extern wDrawColor wDrawColorBlack; extern long mswThickFont; extern double mswScale; +extern double scaleIcon; DWORD mswGetBaseStyle( wWin_p ); char * mswStrdup( const char * ); @@ -190,4 +202,5 @@ void deleteBitmaps( void ); void mswDrawIcon( HDC, int, int, wIcon_p, int, COLORREF, COLORREF ); /* gwin32.c*/ -char *g_win32_getlocale (void);
\ No newline at end of file +char *g_win32_getlocale (void); + |