mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfixes' into develop

Browse Source 
Conflicts:
	include/nana/detail/linux_X11/platform_spec.hpp
	source/detail/linux_X11/platform_spec.cpp
	source/paint/detail/native_paint_interface.cpp
This commit is contained in:
cnjinhao
2015-01-02 23:54:55 +08:00
parent 1c664da5e0 3ba765ea68
commit 4bc00f3517
11 changed files with 87 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/nana/detail/linux_X11/platform_spec.hpp
View File

@@ -98,7 +98,7 @@ namespace detail
unsigned whitespace_pixels;
}string;
#if defined(NANA_UNICODE)
XftDraw * xftdraw;
XftDraw * xftdraw{nullptr};
XftColor xft_fgcolor;
const std::string charset(const nana::string& str, const std::string& strcode);
#endif
@@ -138,6 +138,7 @@ namespace detail
Atom net_wm_state_maximized_horz;
Atom net_wm_state_maximized_vert;
Atom net_wm_state_modal;
Atom net_wm_name;
Atom net_wm_window_type;
Atom net_wm_window_type_normal;
Atom net_wm_window_type_utility;