forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better conditional compilation

This commit is contained in:
Vadim Lopatin 2014-12-05 14:56:00 +03:00
parent 7c70116c91
commit 483e10c980
3 changed files with 995 additions and 1001 deletions
src/dlangui/platforms
sdl
sdlapp.d
windows
win32drawbuf.dwin32fonts.d

66
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -17,32 +17,32 @@ Authors: Vadim Lopatin, coolreader.org@gmail.com
*/ */
module dlangui.platforms.sdl.sdlapp; module dlangui.platforms.sdl.sdlapp;
version(USE_SDL) { version(USE_SDL):
import core.runtime; import core.runtime;
import std.conv; import std.conv;
import std.string; import std.string;
import std.utf; import std.utf;
import std.stdio; import std.stdio;
import std.algorithm; import std.algorithm;
import std.file; import std.file;
import dlangui.core.logger; import dlangui.core.logger;
import dlangui.core.events; import dlangui.core.events;
import dlangui.graphics.drawbuf; import dlangui.graphics.drawbuf;
import dlangui.graphics.fonts; import dlangui.graphics.fonts;
import dlangui.graphics.ftfonts; import dlangui.graphics.ftfonts;
import dlangui.graphics.resources; import dlangui.graphics.resources;
import dlangui.widgets.styles; import dlangui.widgets.styles;
import dlangui.widgets.widget; import dlangui.widgets.widget;
import dlangui.platforms.common.platform; import dlangui.platforms.common.platform;
import derelict.sdl2.sdl; import derelict.sdl2.sdl;
import derelict.opengl3.gl3; import derelict.opengl3.gl3;
version (USE_OPENGL) { version (USE_OPENGL) {
import dlangui.graphics.gldrawbuf; import dlangui.graphics.gldrawbuf;
import dlangui.graphics.glsupport; import dlangui.graphics.glsupport;
} }
// pragma(lib, "xcb"); // pragma(lib, "xcb");
@ -52,7 +52,7 @@ version(USE_SDL) {
// pragma(lib, "X11"); // pragma(lib, "X11");
// pragma(lib, "dl"); // pragma(lib, "dl");
class SDLWindow : Window { class SDLWindow : Window {
SDLPlatform _platform; SDLPlatform _platform;
SDL_Window * _win; SDL_Window * _win;
SDL_Renderer* _renderer; SDL_Renderer* _renderer;
@ -672,11 +672,11 @@ version(USE_SDL) {
if (code == _lastRedrawEventCode) if (code == _lastRedrawEventCode)
redraw(); redraw();
} }
} }
private __gshared bool _enableOpengl; private __gshared bool _enableOpengl;
class SDLPlatform : Platform { class SDLPlatform : Platform {
this() { this() {
} }
@ -923,12 +923,12 @@ version(USE_SDL) {
} }
protected SDLWindow[uint] _windowMap; protected SDLWindow[uint] _windowMap;
} }
// entry point // entry point
extern(C) int UIAppMain(string[] args); extern(C) int UIAppMain(string[] args);
version (Windows) { version (Windows) {
import win32.windows; import win32.windows;
import dlangui.platforms.windows.win32fonts; import dlangui.platforms.windows.win32fonts;
pragma(lib, "gdi32.lib"); pragma(lib, "gdi32.lib");
@ -1002,7 +1002,7 @@ version(USE_SDL) {
return sdlmain(args); return sdlmain(args);
} }
} else { } else {
int main(string[] args) int main(string[] args)
{ {
@ -1018,9 +1018,9 @@ version(USE_SDL) {
return sdlmain(args); return sdlmain(args);
} }
} }
int sdlmain(string[] args) { int sdlmain(string[] args) {
currentTheme = createDefaultTheme(); currentTheme = createDefaultTheme();
try { try {
@ -1099,6 +1099,4 @@ version(USE_SDL) {
Log.d("Exiting main"); Log.d("Exiting main");
return res; return res;
}
} }

4
src/dlangui/platforms/windows/win32drawbuf.d
View File

@ -1,6 +1,6 @@
module dlangui.platforms.windows.win32drawbuf; module dlangui.platforms.windows.win32drawbuf;
version (Windows) { version(Windows):
import win32.windows; import win32.windows;
import dlangui.core.logger; import dlangui.core.logger;
@ -127,5 +127,3 @@ class Win32ColorDrawBuf : ColorDrawBufBase {
BitBlt(dc, x, y, _dx, _dy, _drawdc, 0, 0, SRCCOPY); BitBlt(dc, x, y, _dx, _dy, _drawdc, 0, 0, SRCCOPY);
} }
} }
}

4
src/dlangui/platforms/windows/win32fonts.d
View File

@ -1,6 +1,6 @@
module dlangui.platforms.windows.win32fonts; module dlangui.platforms.windows.win32fonts;
version (Windows) { version(Windows):
import win32.windows; import win32.windows;
import dlangui.graphics.fonts; import dlangui.graphics.fonts;
@ -426,5 +426,3 @@ extern(Windows) {
return 1; return 1;
} }
} }
}