diff --git a/examples/core/core_clipboard_image.c b/examples/core/core_clipboard_image.c index 607d31bd..685d1a5f 100644 --- a/examples/core/core_clipboard_image.c +++ b/examples/core/core_clipboard_image.c @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) { BeginDrawing(); ClearBackground(RAYWHITE); if (IsTextureValid(tex)) { - DrawTexture(tex, 0, 0, WHITE); + DrawTexture(tex, 0, 10 + 21, WHITE); } DrawText("Print Screen and Crtl+V", 10, 10, 21, BLACK); EndDrawing(); diff --git a/src/platforms/rcore_clipboard_win32.c b/src/platforms/rcore_clipboard_win32.c index e7cba10e..2eed8468 100644 --- a/src/platforms/rcore_clipboard_win32.c +++ b/src/platforms/rcore_clipboard_win32.c @@ -8,59 +8,6 @@ #include #include -#define DrawText DrawText_win32 -#define Rectangle rectangle_win32 -#define CloseWindow CloseWindow_win32 -#define ShowCursor __imp_ShowCursor - -// To avoid conflicting windows.h symbols with raylib, some flags are defined -// WARNING: Those flags avoid inclusion of some Win32 headers that could be required -// by user at some point and won't be included... -//------------------------------------------------------------------------------------- - -#define NOGDICAPMASKS // CC_*, LC_*, PC_*, CP_*, TC_*, RC_ -#define NOVIRTUALKEYCODES // VK_* -#define NOWINMESSAGES // WM_*, EM_*, LB_*, CB_* -#define NOWINSTYLES // WS_*, CS_*, ES_*, LBS_*, SBS_*, CBS_* -#define NOSYSMETRICS // SM_* -#define NOMENUS // MF_* -#define NOICONS // IDI_* -#define NOKEYSTATES // MK_* -#define NOSYSCOMMANDS // SC_* -#define NORASTEROPS // Binary and Tertiary raster ops -#define NOSHOWWINDOW // SW_* -#define OEMRESOURCE // OEM Resource values -#define NOATOM // Atom Manager routines -#define NOCLIPBOARD // Clipboard routines -#define NOCOLOR // Screen colors -#define NOCTLMGR // Control and Dialog routines -#define NODRAWTEXT // DrawText() and DT_* -// #define NOGDI // All GDI defines and routines -#define NOKERNEL // All KERNEL defines and routines -#define NOUSER // All USER defines and routines -#define NONLS // All NLS defines and routines -#define NOMB // MB_* and MessageBox() -#define NOMEMMGR // GMEM_*, LMEM_*, GHND, LHND, associated routines -#define NOMETAFILE // typedef METAFILEPICT -#define NOMINMAX // Macros min(a,b) and max(a,b) -#define NOMSG // typedef MSG and associated routines -#define NOOPENFILE // OpenFile(), OemToAnsi, AnsiToOem, and OF_* -#define NOSCROLL // SB_* and scrolling routines -#define NOSERVICE // All Service Controller routines, SERVICE_ equates, etc. -#define NOSOUND // Sound driver routines -#define NOTEXTMETRIC // typedef TEXTMETRIC and associated routines -#define NOWH // SetWindowsHook and WH_* -#define NOWINOFFSETS // GWL_*, GCL_*, associated routines -#define NOCOMM // COMM driver routines -#define NOKANJI // Kanji support stuff. -#define NOHELP // Help engine interface. -#define NOPROFILER // Profiler interface. -#define NODEFERWINDOWPOS // DeferWindowPos routines -#define NOMCX // Modem Configuration Extensions - -// Type required before windows.h inclusion -typedef struct tagMSG *LPMSG; - #define WIN32_LEAN_AND_MEAN // #include // #include @@ -393,51 +340,5 @@ static int GetPixelDataOffset(BITMAPINFOHEADER bih) return bih.biSize + offset; } - -#undef NOGDICAPMASKS // CC_*, LC_*, PC_*, CP_*, TC_*, RC_ -#undef NOVIRTUALKEYCODES // VK_* -#undef NOWINMESSAGES // WM_*, EM_*, LB_*, CB_* -#undef NOWINSTYLES // WS_*, CS_*, ES_*, LBS_*, SBS_*, CBS_* -#undef NOSYSMETRICS // SM_* -#undef NOMENUS // MF_* -#undef NOICONS // IDI_* -#undef NOKEYSTATES // MK_* -#undef NOSYSCOMMANDS // SC_* -#undef NORASTEROPS // Binary and Tertiary raster ops -#undef NOSHOWWINDOW // SW_* -#undef OEMRESOURCE // OEM Resource values -#undef NOATOM // Atom Manager routines -#undef NOCLIPBOARD // Clipboard routines -#undef NOCOLOR // Screen colors -#undef NOCTLMGR // Control and Dialog routines -#undef NODRAWTEXT // DrawText() and DT_* -#undef NOGDI // All GDI defines and routines -#undef NOKERNEL // All KERNEL defines and routines -#undef NOUSER // All USER defines and routines -#undef NONLS // All NLS defines and routines -#undef NOMB // MB_* and MessageBox() -#undef NOMEMMGR // GMEM_*, LMEM_*, GHND, LHND, associated routines -#undef NOMETAFILE // typedef METAFILEPICT -#undef NOMINMAX // Macros min(a,b) and max(a,b) -#undef NOMSG // typedef MSG and associated routines -#undef NOOPENFILE // OpenFile(), OemToAnsi, AnsiToOem, and OF_* -#undef NOSCROLL // SB_* and scrolling routines -#undef NOSERVICE // All Service Controller routines, SERVICE_ equates, etc. -#undef NOSOUND // Sound driver routines -#undef NOTEXTMETRIC // typedef TEXTMETRIC and associated routines -#undef NOWH // SetWindowsHook and WH_* -#undef NOWINOFFSETS // GWL_*, GCL_*, associated routines -#undef NOCOMM // COMM driver routines -#undef NOKANJI // Kanji support stuff. -#undef NOHELP // Help engine interface. -#undef NOPROFILER // Profiler interface. -#undef NODEFERWINDOWPOS // DeferWindowPos routines -#undef NOMCX // Modem Configuration Extensions - -#undef DrawText -#undef ShowCursor -#undef CloseWindow -#undef Rectangle -#undef HWND #endif // EOF