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

Merge branch 'develop' into hotfix-1.6

Browse Source
This commit is contained in:
Jinhao 2018-05-29 04:15:00 +08:00
commit 5d0650ffe7
5 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nana/gui/widgets/listbox.hpp
View File

@ -1215,9 +1215,6 @@ namespace nana
unsigned suspension_width{ 8 }; ///< def= . the trigger will set this to the width if ("...") unsigned suspension_width{ 8 }; ///< def= . the trigger will set this to the width if ("...")
unsigned text_margin{ 5 }; ///< def= 5. Additional or extended with added (before) to the text width to determine the cell width. cell_w = text_w + ext_w +1 unsigned text_margin{ 5 }; ///< def= 5. Additional or extended with added (before) to the text width to determine the cell width. cell_w = text_w + ext_w +1
//deprecated
//unsigned header_height { 25 }; ///< def=25 . header height header_size
unsigned item_height_ex{ 6 }; ///< Set !=0 !!!! def=6. item_height = text_height + item_height_ex unsigned item_height_ex{ 6 }; ///< Set !=0 !!!! def=6. item_height = text_height + item_height_ex
unsigned header_splitter_area_before{ 2 }; ///< def=2. But 4 is better... IMO unsigned header_splitter_area_before{ 2 }; ///< def=2. But 4 is better... IMO
unsigned header_splitter_area_after{ 3 }; ///< def=3. But 4 is better... unsigned header_splitter_area_after{ 3 }; ///< def=3. But 4 is better...

4
source/audio/detail/audio_device.cpp
View File

@ -65,7 +65,7 @@ namespace nana{namespace audio
bool audio_device::empty() const bool audio_device::empty() const
{ {
#if defined(NANA_POSIX) && not defined(NANA_LINUX) #if defined(NANA_POSIX) && !defined(NANA_LINUX)
return (-1 == handle_); return (-1 == handle_);
#else #else
return (nullptr == handle_); return (nullptr == handle_);
@ -305,7 +305,7 @@ namespace nana{namespace audio
}//end namespace audio }//end namespace audio
}//end namespace nana }//end namespace nana
#if defined(NANA_POSIX) && not defined(NANA_LINUX) #if defined(NANA_POSIX) && !defined(NANA_LINUX)
// parse input securely, no-overruns or overflows. // parse input securely, no-overruns or overflows.
static bool match(char *&cursor, const char *pattern, const char *tail) static bool match(char *&cursor, const char *pattern, const char *tail)
{ {

27
source/gui/detail/bedrock_windows.cpp
View File

@ -408,16 +408,7 @@ namespace detail
if (msg.message == WM_QUIT) break; if (msg.message == WM_QUIT) break;
if ((WM_KEYFIRST <= msg.message && msg.message <= WM_KEYLAST) || !::IsDialogMessage(native_handle, &msg)) if ((WM_KEYFIRST <= msg.message && msg.message <= WM_KEYLAST) || !::IsDialogMessage(native_handle, &msg))
{ {
#if 0
auto menu_wd = get_menu(reinterpret_cast<native_window_type>(msg.hwnd), true);
if (menu_wd) interior_helper_for_menu(msg, menu_wd);
::TranslateMessage(&msg); //deprecated
::DispatchMessage(&msg);
#else
process_msg(this, msg); process_msg(this, msg);
#endif
wd_manager().remove_trash_handle(tid); wd_manager().remove_trash_handle(tid);
} }
} }
@ -429,15 +420,7 @@ namespace detail
{ {
if (-1 != ::GetMessage(&msg, 0, 0, 0)) if (-1 != ::GetMessage(&msg, 0, 0, 0))
{ {
#if 0
auto menu_wd = get_menu(reinterpret_cast<native_window_type>(msg.hwnd), true);
if (menu_wd) interior_helper_for_menu(msg, menu_wd);
::TranslateMessage(&msg);
::DispatchMessage(&msg);
#else
process_msg(this, msg); process_msg(this, msg);
#endif
} }
wd_manager().call_safe_place(tid); wd_manager().call_safe_place(tid);
@ -452,17 +435,7 @@ namespace detail
while(context->window_count) while(context->window_count)
{ {
if(-1 != ::GetMessage(&msg, 0, 0, 0)) if(-1 != ::GetMessage(&msg, 0, 0, 0))
{
#if 0
auto menu_wd = get_menu(reinterpret_cast<native_window_type>(msg.hwnd), true);
if(menu_wd) interior_helper_for_menu(msg, menu_wd);
::TranslateMessage(&msg);
::DispatchMessage(&msg);
#else
process_msg(this, msg); process_msg(this, msg);
#endif
}
wd_manager().call_safe_place(tid); wd_manager().call_safe_place(tid);
wd_manager().remove_trash_handle(tid); wd_manager().remove_trash_handle(tid);

7
source/gui/place.cpp
View File

@ -2583,9 +2583,8 @@ namespace nana
: public division : public division
{ {
public: public:
div_switchable(std::string && name, implement* /*impl*/) noexcept: div_switchable(std::string && name, implement*) noexcept:
division(kind::switchable, std::move(name))//, division(kind::switchable, std::move(name))
//impl_(impl) //deprecated
{} {}
private: private:
void collocate(window wd) override void collocate(window wd) override
@ -2613,8 +2612,6 @@ namespace nana
} }
} }
} }
private:
//implement * const impl_; //deprecated
}; };
place::implement::~implement() place::implement::~implement()

6
source/gui/widgets/skeletons/content_view.cpp
View File

@ -68,12 +68,6 @@ namespace nana {
bool drag_started{ false }; bool drag_started{ false };
point origin; point origin;
/*
scrolls enabled_scrolls{scrolls::both}; //deprecated
nana::scroll<false> horz;
nana::scroll<true> vert;
*/
std::shared_ptr<cv_scroll_rep> cv_scroll; std::shared_ptr<cv_scroll_rep> cv_scroll;
timer tmr; timer tmr;