Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-11 17:41:15 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into work

Browse Source
This commit is contained in:
Paul Licameli 2016-04-11 07:41:52 -04:00
commit 132591fd3e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Screenshot.cpp
View File

@ -268,11 +268,19 @@ std::unique_ptr<ScreenshotCommand> ScreenFrame::CreateCommand()
ScreenFrame::ScreenFrame(wxWindow * parent, wxWindowID id) ScreenFrame::ScreenFrame(wxWindow * parent, wxWindowID id)
: wxFrame(parent, id, _("Screen Capture Frame"), : wxFrame(parent, id, _("Screen Capture Frame"),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
#if !defined(__WXMSW__) #if !defined(__WXMSW__)
wxFRAME_TOOL_WINDOW|
#if !defined(__WXMAC__) // bug1358
wxFRAME_TOOL_WINDOW |
#endif
#else #else
wxSTAY_ON_TOP| wxSTAY_ON_TOP|
#endif #endif
wxSYSTEM_MENU|wxCAPTION|wxCLOSE_BOX), wxSYSTEM_MENU|wxCAPTION|wxCLOSE_BOX),
mContext(&wxGetApp(), GetActiveProject()) mContext(&wxGetApp(), GetActiveProject())
{ {

2
src/toolbars/ToolManager.cpp
View File

@ -90,7 +90,9 @@ class ToolFrame final : public wxFrame
wxDefaultSize, wxDefaultSize,
wxNO_BORDER | wxNO_BORDER |
wxFRAME_NO_TASKBAR | wxFRAME_NO_TASKBAR |
#if !defined(__WXMAC__) // bug1358
wxFRAME_TOOL_WINDOW | wxFRAME_TOOL_WINDOW |
#endif
wxFRAME_FLOAT_ON_PARENT ) wxFRAME_FLOAT_ON_PARENT )
{ {
int width = bar->GetSize().x; int width = bar->GetSize().x;