Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -68,8 +68,8 @@ class wxPseudoTransparentFrame : public wxFrame
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxPseudoTransparentFrame(wxWindow* parent = NULL,
|
wxPseudoTransparentFrame(wxWindow* parent = NULL,
|
||||||
wxWindowID id = -1,
|
wxWindowID id = wxID_ANY,
|
||||||
const wxString& title = wxT(""),
|
const wxString& title = wxEmptyString,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
long style = wxDEFAULT_FRAME_STYLE,
|
long style = wxDEFAULT_FRAME_STYLE,
|
||||||
@@ -121,7 +121,7 @@ public:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnPaint(wxPaintEvent & event)
|
void OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
wxPaintDC dc(this);
|
wxPaintDC dc(this);
|
||||||
|
|
||||||
@@ -598,7 +598,7 @@ void wxFrameManager::SetManagedWindow(wxWindow* frame)
|
|||||||
|
|
||||||
// Make a window to use for a transparent hint
|
// Make a window to use for a transparent hint
|
||||||
#if defined(__WXMSW__) || defined(__WXGTK__)
|
#if defined(__WXMSW__) || defined(__WXGTK__)
|
||||||
m_hint_wnd = new wxFrame(m_frame, -1, wxEmptyString, wxDefaultPosition, wxSize(1,1),
|
m_hint_wnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(1,1),
|
||||||
wxFRAME_TOOL_WINDOW |
|
wxFRAME_TOOL_WINDOW |
|
||||||
wxFRAME_FLOAT_ON_PARENT |
|
wxFRAME_FLOAT_ON_PARENT |
|
||||||
wxFRAME_NO_TASKBAR |
|
wxFRAME_NO_TASKBAR |
|
||||||
@@ -609,7 +609,7 @@ void wxFrameManager::SetManagedWindow(wxWindow* frame)
|
|||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
// Using a miniframe with float and tool styles keeps the parent
|
// Using a miniframe with float and tool styles keeps the parent
|
||||||
// frame activated and highlighted as such...
|
// frame activated and highlighted as such...
|
||||||
m_hint_wnd = new wxMiniFrame(m_frame, -1, wxEmptyString, wxDefaultPosition, wxSize(1,1),
|
m_hint_wnd = new wxMiniFrame(m_frame, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(1,1),
|
||||||
wxFRAME_FLOAT_ON_PARENT
|
wxFRAME_FLOAT_ON_PARENT
|
||||||
| wxFRAME_TOOL_WINDOW
|
| wxFRAME_TOOL_WINDOW
|
||||||
| wxCAPTION );
|
| wxCAPTION );
|
||||||
@@ -640,7 +640,7 @@ void wxFrameManager::SetManagedWindow(wxWindow* frame)
|
|||||||
m_hint_wnd = NULL;
|
m_hint_wnd = NULL;
|
||||||
|
|
||||||
// If we can convert it to a PseudoTransparent window, do so
|
// If we can convert it to a PseudoTransparent window, do so
|
||||||
m_hint_wnd = new wxPseudoTransparentFrame (m_frame, -1, wxEmptyString, wxDefaultPosition, wxSize(1,1),
|
m_hint_wnd = new wxPseudoTransparentFrame (m_frame, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(1,1),
|
||||||
wxFRAME_TOOL_WINDOW |
|
wxFRAME_TOOL_WINDOW |
|
||||||
wxFRAME_FLOAT_ON_PARENT |
|
wxFRAME_FLOAT_ON_PARENT |
|
||||||
wxFRAME_NO_TASKBAR |
|
wxFRAME_NO_TASKBAR |
|
||||||
|
@@ -4409,7 +4409,7 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC, WXHWND hWndToPaint)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxWindowMSW::HandlePrintClient(WXHDC hDC)
|
bool wxWindowMSW::HandlePrintClient(WXHDC WXUNUSED(hDC))
|
||||||
{
|
{
|
||||||
// TODO: handle wxBG_STYLE_CUSTOM and/or wxBG_STYLE_COLOUR here so when
|
// TODO: handle wxBG_STYLE_CUSTOM and/or wxBG_STYLE_COLOUR here so when
|
||||||
// DrawParentThemeBackground() from uxtheme.dll is called we don't get
|
// DrawParentThemeBackground() from uxtheme.dll is called we don't get
|
||||||
|
Reference in New Issue
Block a user