interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Began the Windows Table integration.

This commit is contained in:
Pietro Gagliardi 2015-02-17 20:39:13 -05:00
parent a21ad39a2c
commit 8405292a2c
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
comctl32_windows.c
View File

@ -9,14 +9,14 @@ static HMODULE comctl32;
BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR);
LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM); LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM);
HIMAGELIST (*WINAPI fv_ImageList_Create)(int, int, UINT, int, int);
int (*WINAPI fv_ImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); // these are listed as WINAPI on MSDN
BOOL (*WINAPI fv_ImageList_Destroy)(HIMAGELIST); BOOL (*WINAPI fv__TrackMouseEvent)(LPTRACKMOUSEEVENT);
#define wantedICCClasses ( \ #define wantedICCClasses ( \
ICC_PROGRESS_CLASS | /* progress bars */ \ ICC_PROGRESS_CLASS | /* progress bars */ \
ICC_TAB_CLASSES | /* tabs */ \ ICC_TAB_CLASSES | /* tabs */ \
ICC_LISTVIEW_CLASSES | /* list views */ \ ICC_LISTVIEW_CLASSES | /* table headers */ \
ICC_UPDOWN_CLASS | /* spinboxes */ \ ICC_UPDOWN_CLASS | /* spinboxes */ \
0) 0)
@ -119,12 +119,8 @@ DWORD initCommonControls(char **errmsg)
fv_RemoveWindowSubclass = (BOOL (*WINAPI)(HWND, SUBCLASSPROC, UINT_PTR)) f; fv_RemoveWindowSubclass = (BOOL (*WINAPI)(HWND, SUBCLASSPROC, UINT_PTR)) f;
LOAD("DefSubclassProc"); LOAD("DefSubclassProc");
fv_DefSubclassProc = (LRESULT (*WINAPI)(HWND, UINT, WPARAM, LPARAM)) f; fv_DefSubclassProc = (LRESULT (*WINAPI)(HWND, UINT, WPARAM, LPARAM)) f;
LOAD("ImageList_Create"); LOAD("_TrackMouseEvent");
fv_ImageList_Create = (HIMAGELIST (*WINAPI)(int, int, UINT, int, int)) f; fv__TrackMouseEvent = (HIMAGELIST (*WINAPI)(int, int, UINT, int, int)) f;
LOAD("ImageList_Add");
fv_ImageList_Add = (int (*WINAPI)(HIMAGELIST, HBITMAP, HBITMAP)) f;
LOAD("ImageList_Destroy");
fv_ImageList_Destroy = (BOOL (*WINAPI)(HIMAGELIST)) f;
if ((*ficc)(&icc) == FALSE) { if ((*ficc)(&icc) == FALSE) {
*errmsg = "error initializing Common Controls (comctl32.dll)"; *errmsg = "error initializing Common Controls (comctl32.dll)";

13
winapi_windows.h
View File

@ -41,9 +41,8 @@ extern DWORD initCommonControls(char **);
extern BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); extern BOOL (*WINAPI fv_SetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR);
extern BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); extern BOOL (*WINAPI fv_RemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR);
extern LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM); extern LRESULT (*WINAPI fv_DefSubclassProc)(HWND, UINT, WPARAM, LPARAM);
extern HIMAGELIST (*WINAPI fv_ImageList_Create)(int, int, UINT, int, int); // these are listed as WINAPI on MSDN
extern int (*WINAPI fv_ImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); extern BOOL (*WINAPI fv__TrackMouseEvent)(LPTRACKMOUSEEVENT);
extern BOOL (*WINAPI fv_ImageList_Destroy)(HIMAGELIST);
// control_windows.c // control_windows.c
extern HWND newControl(LPWSTR, DWORD, DWORD); extern HWND newControl(LPWSTR, DWORD, DWORD);
@ -107,6 +106,7 @@ extern void tabEnterChildren(HWND);
extern void tabLeaveChildren(HWND); extern void tabLeaveChildren(HWND);
// table_windows.go // table_windows.go
#include "wintable/includethis.h"
extern LPWSTR xWC_LISTVIEW; extern LPWSTR xWC_LISTVIEW;
extern void setTableSubclass(HWND, void *); extern void setTableSubclass(HWND, void *);
extern void tableAppendColumn(HWND, int, LPWSTR); extern void tableAppendColumn(HWND, int, LPWSTR);
@ -134,13 +134,6 @@ extern HBITMAP unscaledBitmap(void *, intptr_t, intptr_t);
extern HIMAGELIST newImageList(int, int); extern HIMAGELIST newImageList(int, int);
extern void addImage(HIMAGELIST, HWND, HBITMAP, int, int, int, int); extern void addImage(HIMAGELIST, HWND, HBITMAP, int, int, int, int);
extern void applyImageList(HWND, UINT, WPARAM, HIMAGELIST, HIMAGELIST); extern void applyImageList(HWND, UINT, WPARAM, HIMAGELIST, HIMAGELIST);
enum {
checkboxStateChecked = 1 << 0,
checkboxStateHot = 1 << 1,
checkboxStatePushed = 1 << 2,
checkboxnStates = 1 << 3,
};
extern HIMAGELIST makeCheckboxImageList(HWND, HTHEME *);
// dialog_windows.c // dialog_windows.c
extern void openFile(HWND, void *); extern void openFile(HWND, void *);