Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blind fixes for warnings in wxTinderbox.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-26 19:22:56 +00:00
parent b20edf8b33
commit 78f9336500
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mgl/settings.cpp
View File

@@ -68,6 +68,9 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial"); gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");
return *gs_fontDefault; return *gs_fontDefault;
} }
default:
{
}
} }
return wxNullFont; return wxNullFont;
@@ -88,6 +91,9 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
case wxSYS_VSCROLL_X: case wxSYS_VSCROLL_X:
case wxSYS_HSCROLL_Y: case wxSYS_HSCROLL_Y:
return 15; return 15;
default:
{
}
} }
return -1; // unsupported metric return -1; // unsupported metric
@@ -101,6 +107,9 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
return false; return false;
case wxSYS_CAN_DRAW_FRAME_DECORATIONS: case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
return false; return false;
default:
{
}
} }
return false; return false;

13
src/mgl/toplevel.cpp
View File

@@ -22,9 +22,12 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/defs.h" #ifndef WX_PRECOMP
#include "wx/toplevel.h" #include "wx/defs.h"
#include "wx/app.h" #include "wx/toplevel.h"
#include "wx/app.h"
#endif // WX_PRECOMP
#include "wx/mgl/private.h" #include "wx/mgl/private.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -115,8 +118,8 @@ wxTopLevelWindowMGL::~wxTopLevelWindowMGL()
if (wxTheApp->GetTopWindow() == this) if (wxTheApp->GetTopWindow() == this)
wxTheApp->SetTopWindow(NULL); wxTheApp->SetTopWindow(NULL);
if ((wxTopLevelWindows.Number() == 0) && if (wxTopLevelWindows.IsEmpty() &&
(wxTheApp->GetExitOnFrameDelete())) wxTheApp->GetExitOnFrameDelete())
{ {
wxTheApp->ExitMainLoop(); wxTheApp->ExitMainLoop();
} }

9
src/univ/menu.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: univ/menu.cpp // Name: src/univ/menu.cpp
// Purpose: wxMenuItem, wxMenu and wxMenuBar implementation // Purpose: wxMenuItem, wxMenu and wxMenuBar implementation
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -23,6 +23,8 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_MENUS
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/control.h" // for FindAccelIndex() #include "wx/control.h" // for FindAccelIndex()
@@ -32,8 +34,6 @@
#include "wx/log.h" #include "wx/log.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#if wxUSE_MENUS
#include "wx/popupwin.h" #include "wx/popupwin.h"
#include "wx/evtloop.h" #include "wx/evtloop.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
@@ -2491,7 +2491,7 @@ void wxMenuBar::OnDismiss()
bool wxMenuBar::ReleaseMouseCapture() bool wxMenuBar::ReleaseMouseCapture()
{ {
#if __WXX11__ #ifdef __WXX11__
// With wxX11, when a menu is closed by clicking away from it, a control // With wxX11, when a menu is closed by clicking away from it, a control
// under the click will still get an event, even though the menu has the // under the click will still get an event, even though the menu has the
// capture (bug?). So that control may already have taken the capture by // capture (bug?). So that control may already have taken the capture by
@@ -2607,4 +2607,3 @@ void wxWindow::DismissPopupMenu()
} }
#endif // wxUSE_MENUS #endif // wxUSE_MENUS