Merge branch 'hotfixes' into develop

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
11 changed files with 87 additions and 16 deletions

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;

View File

@@ -102,12 +102,15 @@ namespace nana
: public widget_object<category::widget_tag, drawerbase::menubar::trigger>
{
public:
menubar(); ///< The default constructor delay creation.
menubar() = default; ///< The default constructor delay creation.
menubar(window); ///< Create a menubar at the top of the specified window.
~menubar();
void create(window); ///< Create a menubar at the top of the specified window.
menu& push_back(const nana::string&); ///< Appends a new (empty) menu.
menu& at(size_t index) const; ///< Gets the menu specified by index.
std::size_t length() const; ///< Number of menus.
private:
::nana::event_handle evt_resized_{nullptr};
};//end class menubar
}//end namespace nana
#endif

View File

@@ -130,7 +130,9 @@ namespace nana
void load(nana::string file);
void store(nana::string file);
void store(nana::string file, nana::unicode encoding);
textbox& reset(nana::string = {}); ///< discard the old text and set a newtext
//A workaround for reset, explicit default constructor syntax, because VC2013 incorrectly treats {} as {0}.
textbox& reset(nana::string = nana::string()); ///< discard the old text and set a newtext
/// The file of last store operation.
nana::string filename() const;