Fix g++ warnings about initialized variables being declared extern.

Don't declare variables extern when initializing them, this is already the
case implicitly anyhow and explicit "extern" results in g++ warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp
index 8dc70566eba5a34cf0f1fbfb8192eefe226c8dd2..44126964e795da1f5c183a9a4f4903ee447f66fb 100644 (file)
--- a/src/msw/gdiplus.cpp
+++ b/src/msw/gdiplus.cpp
@@ -740,8 +740,6 @@ wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxDECL_GDIPLUS_FUNC_TYPE)
 
 #undef wxDECL_GDIPLUS_FUNC_TYPE
 
 
 #undef wxDECL_GDIPLUS_FUNC_TYPE
 

-} // extern "C"
-

 // Special hack for w32api headers that reference this variable which is
 // normally defined in w32api-specific gdiplus.lib but as we don't link with it
 // and load gdiplus.dll dynamically, it's not defined in our case resulting in
 // Special hack for w32api headers that reference this variable which is
 // normally defined in w32api-specific gdiplus.lib but as we don't link with it
 // and load gdiplus.dll dynamically, it's not defined in our case resulting in


@@ -749,9 +747,11 @@ wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxDECL_GDIPLUS_FUNC_TYPE)
 // is and if Cygwin headers are modified to not use it in the future, it's not
 // a big deal neither, we'll just have an unused pointer.
 #if defined(__CYGWIN__) || defined(__MINGW32__)
 // is and if Cygwin headers are modified to not use it in the future, it's not
 // a big deal neither, we'll just have an unused pointer.
 #if defined(__CYGWIN__) || defined(__MINGW32__)

-extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL;
+void *_GdipStringFormatCachedGenericTypographic = NULL;

 #endif // __CYGWIN__ || __MINGW32__
 
 #endif // __CYGWIN__ || __MINGW32__
 

+} // extern "C"
+

 // ============================================================================
 // wxGdiPlus helper class
 // ============================================================================
 // ============================================================================
 // wxGdiPlus helper class
 // ============================================================================

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 31c9f5e62ec26ffce135204bdd396e530ec5fb45..609a1a4b31856164503587c9b83adbed5de8f71a 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -186,7 +186,7 @@ extern wxMenu *wxCurrentPopupMenu;
 // This is a hack used by the owner-drawn wxButton implementation to ensure
 // that the brush used for erasing its background is correctly aligned with the
 // control.
 // This is a hack used by the owner-drawn wxButton implementation to ensure
 // that the brush used for erasing its background is correctly aligned with the
 // control.

-extern wxWindowMSW *wxWindowBeingErased = NULL;
+wxWindowMSW *wxWindowBeingErased = NULL;

 #endif // wxUSE_UXTHEME
 
 namespace
 #endif // wxUSE_UXTHEME
 
 namespace