This commit is contained in:
parent
7c2ab989fa
commit
974947b400
4 changed files with 6 additions and 5 deletions
|
|
@ -172,8 +172,7 @@ static LRESULT CALLBACK wndproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
|
||||||
{
|
{
|
||||||
HDROP hDrop = (HDROP)wp;
|
HDROP hDrop = (HDROP)wp;
|
||||||
UINT count;
|
UINT count;
|
||||||
UINT i, n;
|
UINT i;
|
||||||
HRESULT hr;
|
|
||||||
|
|
||||||
count = wsymtbl.DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0);
|
count = wsymtbl.DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0);
|
||||||
|
|
||||||
|
|
@ -1034,7 +1033,6 @@ static void MwLLSetupDragAndDropImpl(MwLL handle) {
|
||||||
|
|
||||||
static int MwLLGDICallInitImpl(void) {
|
static int MwLLGDICallInitImpl(void) {
|
||||||
void* ntdll;
|
void* ntdll;
|
||||||
HRESULT hr;
|
|
||||||
|
|
||||||
memset(&wsymtbl, 0, sizeof(wsymtbl));
|
memset(&wsymtbl, 0, sizeof(wsymtbl));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -195,7 +195,6 @@ static void llclipboardhandler(MwLL handle, void* data) {
|
||||||
|
|
||||||
static void lldraganddrophandler(MwLL handle, void* data) {
|
static void lldraganddrophandler(MwLL handle, void* data) {
|
||||||
MwWidget h = (MwWidget)handle->common.user;
|
MwWidget h = (MwWidget)handle->common.user;
|
||||||
const char* p = data;
|
|
||||||
if(MwGetInteger(h, MwNdisabled) == 1) return;
|
if(MwGetInteger(h, MwNdisabled) == 1) return;
|
||||||
|
|
||||||
MwDispatchUserHandler(h, MwNdragAndDropHandler, data);
|
MwDispatchUserHandler(h, MwNdragAndDropHandler, data);
|
||||||
|
|
@ -328,7 +327,9 @@ static MwWidget MwCreateWidget_Internal(MwClass widget_class, const char* name,
|
||||||
|
|
||||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||||
if(IsFirstVisible(h)) {
|
if(IsFirstVisible(h)) {
|
||||||
|
#ifdef USE_STB_TRUETYPE
|
||||||
font_setup:
|
font_setup:
|
||||||
|
#endif
|
||||||
h->root_font = MwFontLoad(MwTTFData, MwTTFDataSize);
|
h->root_font = MwFontLoad(MwTTFData, MwTTFDataSize);
|
||||||
h->root_boldfont = MwFontLoad(MwBoldTTFData, MwBoldTTFDataSize);
|
h->root_boldfont = MwFontLoad(MwBoldTTFData, MwBoldTTFDataSize);
|
||||||
h->root_monofont = MwFontLoad(MwMonospaceTTFData, MwMonospaceTTFDataSize);
|
h->root_monofont = MwFontLoad(MwMonospaceTTFData, MwMonospaceTTFDataSize);
|
||||||
|
|
|
||||||
|
|
@ -245,7 +245,7 @@ static BOOL WINAPI _RemoveFontMemResourceExPolyFill(HANDLE h) {
|
||||||
int MwFL_GDISetup(void) {
|
int MwFL_GDISetup(void) {
|
||||||
void* gdilib = LoadLibrary("gdi32.dll");
|
void* gdilib = LoadLibrary("gdi32.dll");
|
||||||
if(!gdilib) {
|
if(!gdilib) {
|
||||||
printf("gdi32.dll not found(?????)\n");
|
printf("gdi32.dll not found(what)\n");
|
||||||
} else {
|
} else {
|
||||||
_AddFontMemResourceEx = (void*)GetProcAddress(gdilib, "AddFontMemResourceEx");
|
_AddFontMemResourceEx = (void*)GetProcAddress(gdilib, "AddFontMemResourceEx");
|
||||||
if(!_AddFontMemResourceEx) {
|
if(!_AddFontMemResourceEx) {
|
||||||
|
|
|
||||||
|
|
@ -180,6 +180,8 @@ static void mouse_down(MwWidget handle, void* ptr) {
|
||||||
MwEntry t = handle->internal;
|
MwEntry t = handle->internal;
|
||||||
MwWidget topmost_parent = handle->parent;
|
MwWidget topmost_parent = handle->parent;
|
||||||
|
|
||||||
|
(void)ptr;
|
||||||
|
|
||||||
while(topmost_parent->parent) topmost_parent = topmost_parent->parent;
|
while(topmost_parent->parent) topmost_parent = topmost_parent->parent;
|
||||||
|
|
||||||
for(i = 0; i < arrlen(topmost_parent->monitored_entries); i++) {
|
for(i = 0; i < arrlen(topmost_parent->monitored_entries); i++) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue