Removed a dependency between oleaut32 and comctl32.
This commit is contained in:
parent
bc3c4d4fca
commit
afa4315507
|
@ -26,8 +26,8 @@ static BOOL
|
||||||
|
|
||||||
DATETIME_SendSimpleNotify (HWND hwnd, UINT code);
|
DATETIME_SendSimpleNotify (HWND hwnd, UINT code);
|
||||||
|
|
||||||
extern char *days[]; /* from ole/parsedt.c */
|
static const char * const days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
|
||||||
|
"Thursday", "Friday", "Saturday", NULL};
|
||||||
|
|
||||||
static LRESULT
|
static LRESULT
|
||||||
DATETIME_GetSystemTime (HWND hwnd, WPARAM wParam, LPARAM lParam )
|
DATETIME_GetSystemTime (HWND hwnd, WPARAM wParam, LPARAM lParam )
|
||||||
|
|
|
@ -34,13 +34,13 @@ DEFAULT_DEBUG_CHANNEL(monthcal)
|
||||||
* we want full month-names, and abbreviated weekdays, so these are
|
* we want full month-names, and abbreviated weekdays, so these are
|
||||||
* defined here */
|
* defined here */
|
||||||
|
|
||||||
extern int mdays[];
|
static const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0};
|
||||||
|
|
||||||
char *monthtxt[] = {"January", "February", "March", "April", "May",
|
const char * const monthtxt[] = {"January", "February", "March", "April", "May",
|
||||||
"June", "July", "August", "September", "October",
|
"June", "July", "August", "September", "October",
|
||||||
"November", "December"};
|
"November", "December"};
|
||||||
char *daytxt[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
|
const char * const daytxt[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
|
||||||
int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
|
static const int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
|
||||||
|
|
||||||
|
|
||||||
#define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongA(hwnd, 0))
|
#define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongA(hwnd, 0))
|
||||||
|
@ -337,7 +337,8 @@ static void MONTHCAL_Refresh(HWND hwnd, HDC hdc)
|
||||||
HBRUSH hbr;
|
HBRUSH hbr;
|
||||||
HFONT currentFont;
|
HFONT currentFont;
|
||||||
/* LOGFONTA logFont; */
|
/* LOGFONTA logFont; */
|
||||||
char buf[20], *thisMonthtxt;
|
char buf[20];
|
||||||
|
const char *thisMonthtxt;
|
||||||
COLORREF oldTextColor, oldBkColor;
|
COLORREF oldTextColor, oldBkColor;
|
||||||
DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
|
DWORD dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
|
||||||
BOOL prssed;
|
BOOL prssed;
|
||||||
|
|
|
@ -58,12 +58,12 @@ static int DecodeTimezone(char *str, int *tzp);
|
||||||
#define USE_DATE_CACHE 1
|
#define USE_DATE_CACHE 1
|
||||||
#define ROUND_ALL 0
|
#define ROUND_ALL 0
|
||||||
|
|
||||||
int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0};
|
static const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0};
|
||||||
|
|
||||||
char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
static const char * const months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
||||||
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", NULL};
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec", NULL};
|
||||||
|
|
||||||
char *days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
|
static const char * const days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
|
||||||
"Thursday", "Friday", "Saturday", NULL};
|
"Thursday", "Friday", "Saturday", NULL};
|
||||||
|
|
||||||
/* those three vars are useless, and not even initialized, so
|
/* those three vars are useless, and not even initialized, so
|
||||||
|
|
|
@ -76,8 +76,8 @@ typedef struct tagMONTHCAL_INFO
|
||||||
|
|
||||||
extern void MONTHCAL_CopyTime (const SYSTEMTIME *from, SYSTEMTIME *to);
|
extern void MONTHCAL_CopyTime (const SYSTEMTIME *from, SYSTEMTIME *to);
|
||||||
extern int MONTHCAL_CalculateDayOfWeek (DWORD day, DWORD month, DWORD year);
|
extern int MONTHCAL_CalculateDayOfWeek (DWORD day, DWORD month, DWORD year);
|
||||||
extern char *daytxt[];
|
extern const char * const daytxt[];
|
||||||
extern char *monthtxt[];
|
extern const char * const monthtxt[];
|
||||||
extern void MONTHCAL_Register (void);
|
extern void MONTHCAL_Register (void);
|
||||||
extern void MONTHCAL_Unregister (void);
|
extern void MONTHCAL_Unregister (void);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue