minor cleanup

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

diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h
index acea85d0ec1399c3a28ca7887c517d2fa913f1b2..876c802520099430dab4c3ab33cb79aec36fb2cd 100644 (file)
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -19,7 +19,6 @@
 #include "wx/log.h"
 #include "wx/stream.h"
 
 #include "wx/log.h"
 #include "wx/stream.h"
 

-class WXDLLIMPEXP_FWD_BASE wxInputStream;

 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 /*
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 /*

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index f73f82e047818a62de72e1460cc915b89a04a7cc..fb106136407d25ef7dfedcbd23f18042dad4691c 100644 (file)
--- a/include/wx/bmpcbox.h
+++ b/include/wx/bmpcbox.h
@@ -18,8 +18,8 @@
 #if wxUSE_BITMAPCOMBOBOX
 
 #include "wx/bitmap.h"
 #if wxUSE_BITMAPCOMBOBOX
 
 #include "wx/bitmap.h"

-#include "wx/window.h"

 
 

+class WXDLLIMPEXP_FWD_CORE wxWindow;

 class WXDLLIMPEXP_FWD_CORE wxItemContainer;
 
 // Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which
 class WXDLLIMPEXP_FWD_CORE wxItemContainer;
 
 // Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which

diff --git a/include/wx/generic/busyinfo.h b/include/wx/generic/busyinfo.h
index b75204a2cd79613a71ca7734e718401dd12a3ad5..87daf294fdd8e5f25a0b38134c69772df5e09509 100644 (file)
--- a/include/wx/generic/busyinfo.h
+++ b/include/wx/generic/busyinfo.h
@@ -7,13 +7,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __BUSYINFO_H__
-#define __BUSYINFO_H__
+#ifndef _WX_BUSYINFO_H_
+#define _WX_BUSYINFO_H_

 
 #include "wx/defs.h"
 
 #if wxUSE_BUSYINFO
 
 
 #include "wx/defs.h"
 
 #if wxUSE_BUSYINFO
 

+#include "wx/object.h"
+

 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 


@@ -36,7 +38,5 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxBusyInfo);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxBusyInfo);
 };
 

-

 #endif // wxUSE_BUSYINFO
 #endif // wxUSE_BUSYINFO

-
-#endif // __BUSYINFO_H__
+#endif // _WX_BUSYINFO_H_

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 1c18dfc9a2b2438580c4d190ebe433c8ec558014..4a1ee4fc7dbf1dc66ae2abdcf39fb40af7f68abb 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -3,20 +3,19 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __IMAGELISTH_G__
-#define __IMAGELISTH_G__
+#ifndef _WX_IMAGLISTG_H_
+#define _WX_IMAGLISTG_H_

 
 

-#include "wx/defs.h"

 #include "wx/list.h"
 #include "wx/list.h"

-#include "wx/icon.h"

 
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxBitmap;

+class WXDLLIMPEXP_FWD_CORE wxIcon;

 class WXDLLIMPEXP_FWD_CORE wxColour;
 
 
 class WXDLLIMPEXP_FWD_CORE wxColour;
 
 


@@ -78,5 +77,4 @@ public:
 };
 #endif // !wxHAS_NATIVE_IMAGELIST
 
 };
 #endif // !wxHAS_NATIVE_IMAGELIST
 

-#endif  // __IMAGELISTH_G__
-
+#endif  // _WX_IMAGLISTG_H_

diff --git a/include/wx/generic/infobar.h b/include/wx/generic/infobar.h
index 43f9108c9a2ecd735f288efbea250d41336cdd1d..2134b744545f524a51024b864febb1e31fe0b535 100644 (file)
--- a/include/wx/generic/infobar.h
+++ b/include/wx/generic/infobar.h
@@ -3,7 +3,7 @@
 // Purpose:     generic wxInfoBar class declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28
 // Purpose:     generic wxInfoBar class declaration
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28

-// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/include/wx/gtk/infobar.h b/include/wx/gtk/infobar.h
index 4956925a8b2116fd5709bae8cc9a976b96e0711a..bd7bdb7f72aee286fd0c4e60b7daa2f83e5a6700 100644 (file)
--- a/include/wx/gtk/infobar.h
+++ b/include/wx/gtk/infobar.h
@@ -3,7 +3,7 @@
 // Purpose:     native implementation of wxInfoBar for GTK+ 2.18 and later
 // Author:      Vadim Zeitlin
 // Created:     2009-09-26
 // Purpose:     native implementation of wxInfoBar for GTK+ 2.18 and later
 // Author:      Vadim Zeitlin
 // Created:     2009-09-26

-// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 2c9a5c3cbacf3bc9ee5889ac88ed331710436eff..1edbbd9b2fda3aa3b0d2a2577f6a279e30f5d131 100644 (file)
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKSTATICBOXH__
-#define __GTKSTATICBOXH__
+#ifndef _WX_GTKSTATICBOX_H_
+#define _WX_GTKSTATICBOX_H_

 
 //-----------------------------------------------------------------------------
 // wxStaticBox
 
 //-----------------------------------------------------------------------------
 // wxStaticBox


@@ -40,7 +40,7 @@ public:
 
     // implementation
 
 
     // implementation
 

-    virtual bool IsTransparentForMouse() const { return TRUE; }
+    virtual bool IsTransparentForMouse() const { return true; }

 
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 
 
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 


@@ -52,8 +52,7 @@ protected:
 
     void DoApplyWidgetStyle(GtkRcStyle *style);
 
 
     void DoApplyWidgetStyle(GtkRcStyle *style);
 

-private:

     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 

-#endif // __GTKSTATICBOXH__
+#endif // _WX_GTKSTATICBOX_H_

diff --git a/include/wx/osx/carbon/evtloop.h b/include/wx/osx/carbon/evtloop.h
index e6d29419d6c2c0ff1950cc27198ed782a49c98c3..5e881875cc2fb37b20bceaab3125539694332acc 100644 (file)
--- a/include/wx/osx/carbon/evtloop.h
+++ b/include/wx/osx/carbon/evtloop.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 

-class OpaqueEventRef;
+struct OpaqueEventRef;

 typedef OpaqueEventRef *EventRef;
 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop
 typedef OpaqueEventRef *EventRef;
 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop

diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index d3a75084d502a7b1dc7a2506b18b63767c779c7e..a309aea5ac584cc912076e73da395779e9692a60 100644 (file)
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -15,4 +15,4 @@
     #include "wx/osx/cocoa/private.h"
 #endif
 
     #include "wx/osx/cocoa/private.h"
 #endif
 

-#endif
\ No newline at end of file
+#endif

diff --git a/include/wx/unix/taskbarx11.h b/include/wx/unix/taskbarx11.h
index f7d8589a136e0e65dbf4577e2ec49ae9ee2ae286..eb57d5766bd87316b0b1d4dd386653d32edb0153 100644 (file)
--- a/include/wx/unix/taskbarx11.h
+++ b/include/wx/unix/taskbarx11.h
@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#ifndef _TASKBAR_H_
-#define _TASKBAR_H_
-
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
+#ifndef _WX_UNIX_TASKBAR_H_
+#define _WX_UNIX_TASKBAR_H_

 
 class WXDLLIMPEXP_FWD_ADV wxTaskBarIconArea;
 
 
 class WXDLLIMPEXP_FWD_ADV wxTaskBarIconArea;
 


@@ -42,5 +38,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
 
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
 

-#endif
-    // _TASKBAR_H_
+#endif // _WX_UNIX_TASKBAR_H_

diff --git a/src/common/taskbarcmn.cpp b/src/common/taskbarcmn.cpp
index 7265473d84f4eb7642a1b6eee8ab2a25f279142f..12ab1d3d0b340db2d9c63f3ebbc0e1c6807a1e9c 100644 (file)
--- a/src/common/taskbarcmn.cpp
+++ b/src/common/taskbarcmn.cpp
@@ -18,6 +18,8 @@
 
 #if wxUSE_TASKBARICON
 
 
 #if wxUSE_TASKBARICON
 

+#include "wx/taskbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/list.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/list.h"


@@ -29,8 +31,6 @@ extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
 // DLL options compatibility check:
 WX_CHECK_BUILD_OPTIONS("wxAdvanced")
 
 // DLL options compatibility check:
 WX_CHECK_BUILD_OPTIONS("wxAdvanced")
 

-#include "wx/taskbar.h"
-

 wxDEFINE_EVENT( wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent );
 wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent );
 wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent );
 wxDEFINE_EVENT( wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent );
 wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent );
 wxDEFINE_EVENT( wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent );

diff --git a/src/generic/infobar.cpp b/src/generic/infobar.cpp
index 5f6c948bb01c5a410746e124fd0cdf59cfc5586e..242242c1745baa5697a640bab60ffa309f0de07c 100644 (file)
--- a/src/generic/infobar.cpp
+++ b/src/generic/infobar.cpp
@@ -3,7 +3,7 @@
 // Purpose:     generic wxInfoBar implementation
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28
 // Purpose:     generic wxInfoBar implementation
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28

-// RCS-ID:      $Id: wxhead.cpp,v 1.10 2009-06-29 10:23:04 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -25,6 +25,8 @@
 
 #if wxUSE_INFOBAR
 
 
 #if wxUSE_INFOBAR
 

+#include "wx/infobar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/button.h"
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/button.h"


@@ -32,14 +34,12 @@
     #include "wx/settings.h"
     #include "wx/statbmp.h"
     #include "wx/stattext.h"
     #include "wx/settings.h"
     #include "wx/statbmp.h"
     #include "wx/stattext.h"

+    #include "wx/sizer.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/infobar.h"
-

 #include "wx/artprov.h"
 #include "wx/renderer.h"
 #include "wx/scopeguard.h"
 #include "wx/artprov.h"
 #include "wx/renderer.h"
 #include "wx/scopeguard.h"

-#include "wx/sizer.h"

 
 BEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase)
     EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton)
 
 BEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase)
     EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton)

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index e5a8a75d6d01fad8b3fe80043040dd63caf0cd27..643a62213218e42d552cddbfe396d9e37c1707ea 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -251,10 +251,8 @@ GtkWidget* wxComboBox::GetConnectWidget()
     return GTK_WIDGET( GetEntry() );
 }
 
     return GTK_WIDGET( GetEntry() );
 }
 

-GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
+GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const

 {
 {

-    wxUnusedVar(windows);
-

     return GetEntry()->text_area;
 }
 
     return GetEntry()->text_area;
 }
 

diff --git a/src/gtk/sockgtk.cpp b/src/gtk/sockgtk.cpp
index 71d26ace50a4ee6f9102f44163b2a31a1d111b01..e887cebb6930afac5afe0227798ba4b281938d3e 100644 (file)
--- a/src/gtk/sockgtk.cpp
+++ b/src/gtk/sockgtk.cpp
@@ -14,12 +14,11 @@
 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 

-#include <gdk/gdk.h>
-#include <glib.h>
-

 #include "wx/apptrait.h"
 #include "wx/private/fdiomanager.h"
 
 #include "wx/apptrait.h"
 #include "wx/private/fdiomanager.h"
 

+#include <gdk/gdk.h>
+

 extern "C" {
 static
 void wxSocket_GDK_Input(gpointer data,
 extern "C" {
 static
 void wxSocket_GDK_Input(gpointer data,

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 6da1bb6c668dd9401e26cc72a1eb75fce4b3f4b9..b7df8b6f58cb2c2f4a983ed8024016d229fa5cd1 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -114,7 +114,7 @@ void wxStaticBox::AddChild( wxWindowBase *child )
     {
         // make this window a container of other wxWindows by instancing a wxPizza
         // and packing it into the GtkFrame:
     {
         // make this window a container of other wxWindows by instancing a wxPizza
         // and packing it into the GtkFrame:

-        m_wxwindow = wxPizza::New( 0 );
+        m_wxwindow = wxPizza::New();

         gtk_widget_show( m_wxwindow );
         gtk_container_add( GTK_CONTAINER (m_widget), m_wxwindow );
     }
         gtk_widget_show( m_wxwindow );
         gtk_container_add( GTK_CONTAINER (m_widget), m_wxwindow );
     }

diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index 46a9c0c8af28b9cf976a3ea33d091aa37d64aa3c..96bc244d381ca567aef84654fc46312a36f766aa 100644 (file)
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -186,8 +186,8 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
 #if 0
     case wxFONTENCODING_UTF7 :
         enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
 #if 0
     case wxFONTENCODING_UTF7 :
         enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;

-#endif

         break ;
         break ;

+#endif

     case wxFONTENCODING_UTF8 :
         enc = kCFStringEncodingUTF8;
         break ;
     case wxFONTENCODING_UTF8 :
         enc = kCFStringEncodingUTF8;
         break ;


@@ -638,9 +638,8 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
         return wxEmptyString ;
 
     Size cflen = CFStringGetLength( ref )  ;
         return wxEmptyString ;
 
     Size cflen = CFStringGetLength( ref )  ;

-    char* buf = NULL ;

 
 

-    CFStringEncoding cfencoding = 0;
+    CFStringEncoding cfencoding;

     wxString result;
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     wxString result;
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR


@@ -657,7 +656,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
     CFIndex cStrLen ;
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding ,
         '?' , false , NULL , 0 , &cStrLen ) ;
     CFIndex cStrLen ;
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding ,
         '?' , false , NULL , 0 , &cStrLen ) ;

-    buf = new char[ cStrLen ] ;
+    char* buf = new char[cStrLen];

     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
 
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
 

diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index 3ed74451c3a1e440393ee30d663ab841c3c91a22..34481098298bee6a415b0876c050530361aeb5b3 100644 (file)
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -525,11 +525,11 @@ wxPrintNativeDataBase* wxOSXCreatePrintData()
 {
 #if wxOSX_USE_COCOA
     return new wxOSXCocoaPrintData();
 {
 #if wxOSX_USE_COCOA
     return new wxOSXCocoaPrintData();

-#endif
-#if wxOSX_USE_CARBON
+#elif wxOSX_USE_CARBON

     return new wxOSXCarbonPrintData();
     return new wxOSXCarbonPrintData();

-#endif
+#else

     return NULL;
     return NULL;

+#endif

 }
 
 /*
 }
 
 /*


@@ -659,7 +659,6 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     {
         if (sm_abortIt)
         {
     {
         if (sm_abortIt)
         {

-                keepGoing = false;

                 break;
         }
         else
                 break;
         }
         else


@@ -717,7 +716,7 @@ bool wxMacPrinter::Setup(wxWindow *WXUNUSED(parent))
     return (ret == wxID_OK);
 #endif
 
     return (ret == wxID_OK);
 #endif
 

-    return wxID_CANCEL;
+    return false;

 }
 
 /*
 }
 
 /*

diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp
index 0b6b77d0e195ef7a1f90c04fd7d83c7b06a6fc27..08711a0980d0fe1f6d5885d0bc47a7baa3904927 100644 (file)
--- a/src/osx/core/sockosx.cpp
+++ b/src/osx/core/sockosx.cpp
@@ -287,6 +287,6 @@ static struct OSXManagerSetter
 } gs_OSXManagerSetter;
 
 // see the relative linker macro in socket.cpp
 } gs_OSXManagerSetter;
 
 // see the relative linker macro in socket.cpp

-wxFORCE_LINK_THIS_MODULE( osxsocket );
+wxFORCE_LINK_THIS_MODULE(osxsocket)

 
 #endif // wxUSE_SOCKETS
 
 #endif // wxUSE_SOCKETS

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index e3e9f996bc387f131cc45a9d1fb6f568e81dc0c2..7c5c828048b59d63b4136642550665921f3fc047 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -191,8 +191,8 @@ bool wxMacLaunch(char **argv)
     // Loop through command line arguments to the bundle,
     // turn them into CFURLs and then put them in cfaFiles
     // For use to launch services call
     // Loop through command line arguments to the bundle,
     // turn them into CFURLs and then put them in cfaFiles
     // For use to launch services call

-        for( ; *argv != NULL ; ++argv)
-        {
+    for( ; *argv != NULL ; ++argv)
+    {

         // Check for '<' as this will ring true for
         // CFURLCreateWithString but is generally not considered
         // typical on mac but is usually passed here from wxExecute
         // Check for '<' as this will ring true for
         // CFURLCreateWithString but is generally not considered
         // typical on mac but is usually passed here from wxExecute


@@ -244,12 +244,12 @@ bool wxMacLaunch(char **argv)
 
         // Add the valid CFURL to the argument array and then
         // release it as the CFArray adds a ref count to it
 
         // Add the valid CFURL to the argument array and then
         // release it as the CFArray adds a ref count to it

-            CFArrayAppendValue(
-                cfaFiles,
-                cfurlCurrentFile
-                            );
-            CFRelease(cfurlCurrentFile); // array has retained it
-        }
+        CFArrayAppendValue(
+            cfaFiles,
+            cfurlCurrentFile
+                        );
+        CFRelease(cfurlCurrentFile); // array has retained it
+    }

 
     // Create a LSLaunchURLSpec for use with LSOpenFromURLSpec
     // Note that there are several flag options (launchFlags) such
 
     // Create a LSLaunchURLSpec for use with LSOpenFromURLSpec
     // Note that there are several flag options (launchFlags) such

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 25a06fd79ede7a1e1eb6cf9167a403e16338a73d..43006895abb4975cefab3e92a8e726ffc78948fd 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -225,7 +225,7 @@ void wxListBox::SetValueCallback( unsigned int WXUNUSED(n), wxListWidgetColumn*
 wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults
 wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults

-    int lbHeight = 110;
+    int lbHeight;

     int wLine;
 
     {
     int wLine;
 
     {

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index ae3328808aa9aa6fb609aac8148668cab16c6b6e..573fd4c6ae5973d05a15800230c4a1332fa8ebd4 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -720,8 +720,7 @@ void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
         m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
     }
 
         m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
     }
 

-    if (m_privateContextMenu != NULL)
-        PopupMenu(m_privateContextMenu);
+    PopupMenu(m_privateContextMenu);

 #endif
 }
 
 #endif
 }
 


@@ -828,9 +827,8 @@ void wxTextWidgetImpl::ShowPosition( long WXUNUSED(pos) )
 
 int wxTextWidgetImpl::GetNumberOfLines() const
 {
 
 int wxTextWidgetImpl::GetNumberOfLines() const
 {

-    ItemCount lines = 0 ;

     wxString content = GetStringValue() ;
     wxString content = GetStringValue() ;

-    lines = 1;
+    ItemCount lines = 1;

 
     for (size_t i = 0; i < content.length() ; i++)
     {
 
     for (size_t i = 0; i < content.length() ; i++)
     {

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index f9016f4511fa96d737a7122085e95bbdc3806a13..23abdab98c491c696e295bd165ac7920d60b9a10 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -897,22 +897,20 @@ wxSize wxWindowMac::DoGetBestSize() const
             r.width =
             r.height = 16 ;
 
             r.width =
             r.height = 16 ;
 

-            if ( 0 )
-            {
-            }

 #if wxUSE_SCROLLBAR
 #if wxUSE_SCROLLBAR

-            else if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+            if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )

             {
                 r.height = 16 ;
             }
             {
                 r.height = 16 ;
             }

+            else

 #endif
 #if wxUSE_SPINBTN
 #endif
 #if wxUSE_SPINBTN

-            else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+            if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )

             {
                 r.height = 24 ;
             }
             {
                 r.height = 24 ;
             }

-#endif

             else
             else

+#endif

             {
                 // return wxWindowBase::DoGetBestSize() ;
             }
             {
                 // return wxWindowBase::DoGetBestSize() ;
             }

diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp
index 6f285d7bda27fabd6f0cdf0074a1258749500951..5e469b427ae01b397a8a7c8e7d63b90463072e90 100644 (file)
--- a/src/ribbon/bar.cpp
+++ b/src/ribbon/bar.cpp
@@ -31,7 +31,7 @@
 
 #include "wx/arrimpl.cpp"
 
 
 #include "wx/arrimpl.cpp"
 

-WX_DEFINE_USER_EXPORTED_OBJARRAY(wxRibbonPageTabInfoArray);
+WX_DEFINE_USER_EXPORTED_OBJARRAY(wxRibbonPageTabInfoArray)

 
 wxDEFINE_EVENT(wxEVT_COMMAND_RIBBONBAR_PAGE_CHANGED, wxRibbonBarEvent);
 wxDEFINE_EVENT(wxEVT_COMMAND_RIBBONBAR_PAGE_CHANGING, wxRibbonBarEvent);
 
 wxDEFINE_EVENT(wxEVT_COMMAND_RIBBONBAR_PAGE_CHANGED, wxRibbonBarEvent);
 wxDEFINE_EVENT(wxEVT_COMMAND_RIBBONBAR_PAGE_CHANGING, wxRibbonBarEvent);


@@ -210,9 +210,9 @@ void wxRibbonBar::OnMouseMove(wxMouseEvent& evt)
     if(m_tab_scroll_buttons_shown)
     {
 #define SET_FLAG(variable, flag) \
     if(m_tab_scroll_buttons_shown)
     {
 #define SET_FLAG(variable, flag) \

-    { if(((variable) & (flag)) != (flag)) variable |= (flag), refresh_tabs = true; }
+    { if(((variable) & (flag)) != (flag)) { variable |= (flag); refresh_tabs = true; }}

 #define UNSET_FLAG(variable, flag) \
 #define UNSET_FLAG(variable, flag) \

-    { if((variable) & (flag)) variable &= ~(flag), refresh_tabs = true; }
+    { if((variable) & (flag)) { variable &= ~(flag); refresh_tabs = true; }}

 
         if(m_tab_scroll_left_button_rect.Contains(x, y))
             SET_FLAG(m_tab_scroll_left_button_state, wxRIBBON_SCROLL_BTN_HOVERED)
 
         if(m_tab_scroll_left_button_rect.Contains(x, y))
             SET_FLAG(m_tab_scroll_left_button_state, wxRIBBON_SCROLL_BTN_HOVERED)

diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index 3de8011a5c4c20a4b1f6ce155a31caa3641835f3..cfc8fe09319a9b70925891bc3d20374b762a6eb8 100644 (file)
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -125,7 +125,7 @@ public:
 
 WX_DECLARE_OBJARRAY(wxRibbonButtonBarButtonInstance, wxArrayRibbonButtonBarButtonInstance);
 #include "wx/arrimpl.cpp"
 
 WX_DECLARE_OBJARRAY(wxRibbonButtonBarButtonInstance, wxArrayRibbonButtonBarButtonInstance);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance);
+WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance)

 
 class wxRibbonButtonBarLayout
 {
 
 class wxRibbonButtonBarLayout
 {


@@ -627,7 +627,7 @@ void wxRibbonButtonBar::CommonInit(long WXUNUSED(style))
     m_lock_active_state = false;
 
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
     m_lock_active_state = false;
 
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);

-};
+}

 
 wxSize wxRibbonButtonBar::GetMinSize() const
 {
 
 wxSize wxRibbonButtonBar::GetMinSize() const
 {


@@ -787,7 +787,7 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
         layout->overall_size.GetHeight() > original->overall_size.GetHeight())
     {
         delete layout;
         layout->overall_size.GetHeight() > original->overall_size.GetHeight())
     {
         delete layout;

-        wxASSERT_MSG(false, wxT("Layout collapse resulted in increased size"));
+        wxFAIL_MSG("Layout collapse resulted in increased size");

         return false;
     }
 
         return false;
     }
 

diff --git a/src/unix/net.cpp b/src/unix/net.cpp
index 194f58e6eaf1cd89efdb755ffb70061cdf6212ef..ab4936b94623aaa4f548cb99e662821066bde9ac 100644 (file)
--- a/src/unix/net.cpp
+++ b/src/unix/net.cpp
@@ -79,7 +79,7 @@ public:
        wxDialUpManager methods.
    */
    virtual bool IsOk() const
        wxDialUpManager methods.
    */
    virtual bool IsOk() const

-      { return TRUE; }
+      { return true; }

 
    /** The simplest way to initiate a dial up: this function dials the given
        ISP (exact meaning of the parameter depends on the platform), returns
 
    /** The simplest way to initiate a dial up: this function dials the given
        ISP (exact meaning of the parameter depends on the platform), returns


@@ -112,7 +112,7 @@ public:
    // so, in general, the user should be allowed to override it. This function
    // allows to forcefully set the online status - whatever our internal
    // algorithm may think about it.
    // so, in general, the user should be allowed to override it. This function
    // allows to forcefully set the online status - whatever our internal
    // algorithm may think about it.

-   virtual void SetOnlineStatus(bool isOnline = TRUE)
+   virtual void SetOnlineStatus(bool isOnline = true)

       { m_IsOnline = isOnline; }
 
    // set misc wxDialUpManager options
       { m_IsOnline = isOnline; }
 
    // set misc wxDialUpManager options


@@ -180,11 +180,11 @@ public:
    AutoCheckTimer(wxDialUpManagerImpl *dupman)
       {
          m_dupman = dupman;
    AutoCheckTimer(wxDialUpManagerImpl *dupman)
       {
          m_dupman = dupman;

-         m_started = FALSE;
+         m_started = false;

       }
 
    virtual bool Start( int millisecs = -1 )
       }
 
    virtual bool Start( int millisecs = -1 )

-      { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
+      { m_started = true; return wxTimer::Start(millisecs, false); }

 
    virtual void Notify()
       { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
 
    virtual void Notify()
       { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }


@@ -202,7 +202,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
                           const wxString & WXUNUSED(password))
 {
    if(m_IsOnline == 1)
                           const wxString & WXUNUSED(password))
 {
    if(m_IsOnline == 1)

-      return FALSE;
+      return false;

    m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;
    m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;


@@ -217,7 +217,7 @@ bool
 wxDialUpManagerImpl::HangUp(void)
 {
    if(m_IsOnline == 0)
 wxDialUpManagerImpl::HangUp(void)
 {
    if(m_IsOnline == 0)

-      return FALSE;
+      return false;

    m_IsOnline = -1;
    wxString cmd;
    if(m_HangUpCommand.Find("%s"))
    m_IsOnline = -1;
    wxString cmd;
    if(m_HangUpCommand.Find("%s"))