Merge remote-tracking branch 'remotes/origin/master' into melonDSi

1 files changed, 0 insertions, 61 deletions

diff --git a/src/libui_sdl/libui/windows/_uipriv_migrate.hpp b/src/libui_sdl/libui/windows/_uipriv_migrate.hpp
deleted file mode 100644
index 13d3670..0000000
--- a/src/libui_sdl/libui/windows/_uipriv_migrate.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-
-// menu.c
-extern HMENU makeMenubar(void);
-extern const uiMenuItem *menuIDToItem(UINT_PTR);
-extern void runMenuEvent(WORD, uiWindow *);
-extern void freeMenubar(HMENU);
-extern void uninitMenus(void);
-
-// draw.c
-extern HRESULT initDraw(void);
-extern void uninitDraw(void);
-extern ID2D1HwndRenderTarget *makeHWNDRenderTarget(HWND hwnd);
-extern uiDrawContext *newContext(ID2D1RenderTarget *);
-extern void freeContext(uiDrawContext *);
-
-// dwrite.cpp
-#ifdef __cplusplus
-extern IDWriteFactory *dwfactory;
-#endif
-extern HRESULT initDrawText(void);
-extern void uninitDrawText(void);
-#ifdef __cplusplus
-struct fontCollection {
-	IDWriteFontCollection *fonts;
-	WCHAR userLocale[LOCALE_NAME_MAX_LENGTH];
-	int userLocaleSuccess;
-};
-extern fontCollection *loadFontCollection(void);
-extern WCHAR *fontCollectionFamilyName(fontCollection *fc, IDWriteFontFamily *family);
-extern void fontCollectionFree(fontCollection *fc);
-extern WCHAR *fontCollectionCorrectString(fontCollection *fc, IDWriteLocalizedStrings *names);
-#endif
-
-// drawtext.cpp
-#ifdef __cplusplus
-extern uiDrawTextFont *mkTextFont(IDWriteFont *df, BOOL addRef, WCHAR *family, BOOL copyFamily, double size);
-struct dwriteAttr {
-	uiDrawTextWeight weight;
-	uiDrawTextItalic italic;
-	uiDrawTextStretch stretch;
-	DWRITE_FONT_WEIGHT dweight;
-	DWRITE_FONT_STYLE ditalic;
-	DWRITE_FONT_STRETCH dstretch;
-};
-extern void attrToDWriteAttr(struct dwriteAttr *attr);
-extern void dwriteAttrToAttr(struct dwriteAttr *attr);
-#endif
-
-// fontdialog.cpp
-#ifdef __cplusplus
-struct fontDialogParams {
-	IDWriteFont *font;
-	double size;
-	WCHAR *familyName;
-	WCHAR *styleName;
-};
-extern BOOL showFontDialog(HWND parent, struct fontDialogParams *params);
-extern void loadInitialFontDialogParams(struct fontDialogParams *params);
-extern void destroyFontDialogParams(struct fontDialogParams *params);
-extern WCHAR *fontDialogParamsToString(struct fontDialogParams *params);
-#endif