From 65391c8ffcb388cd31f610776654f50aed97cbee Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 5 Dec 2009 19:57:58 +0000 Subject: [PATCH] minor cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/animdecod.h | 1 - include/wx/bmpcbox.h | 2 +- include/wx/generic/busyinfo.h | 10 +++++----- include/wx/generic/imaglist.h | 12 +++++------- include/wx/generic/infobar.h | 2 +- include/wx/gtk/infobar.h | 2 +- include/wx/gtk/statbox.h | 9 ++++----- include/wx/osx/carbon/evtloop.h | 2 +- include/wx/osx/private.h | 2 +- include/wx/unix/taskbarx11.h | 11 +++-------- src/common/taskbarcmn.cpp | 4 ++-- src/generic/infobar.cpp | 8 ++++---- src/gtk/combobox.cpp | 4 +--- src/gtk/sockgtk.cpp | 5 ++--- src/gtk/statbox.cpp | 2 +- src/osx/core/cfstring.cpp | 7 +++---- src/osx/core/printmac.cpp | 9 ++++----- src/osx/core/sockosx.cpp | 2 +- src/osx/core/utilsexc_base.cpp | 16 ++++++++-------- src/osx/listbox_osx.cpp | 2 +- src/osx/textctrl_osx.cpp | 6 ++---- src/osx/window_osx.cpp | 10 ++++------ src/ribbon/bar.cpp | 6 +++--- src/ribbon/buttonbar.cpp | 6 +++--- src/unix/net.cpp | 12 ++++++------ 25 files changed, 67 insertions(+), 85 deletions(-) diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h index acea85d0ec..876c802520 100644 --- a/include/wx/animdecod.h +++ b/include/wx/animdecod.h @@ -19,7 +19,6 @@ #include "wx/log.h" #include "wx/stream.h" -class WXDLLIMPEXP_FWD_BASE wxInputStream; class WXDLLIMPEXP_FWD_CORE wxImage; /* diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h index f73f82e047..fb10613640 100644 --- a/include/wx/bmpcbox.h +++ b/include/wx/bmpcbox.h @@ -18,8 +18,8 @@ #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 diff --git a/include/wx/generic/busyinfo.h b/include/wx/generic/busyinfo.h index b75204a2cd..87daf294fd 100644 --- a/include/wx/generic/busyinfo.h +++ b/include/wx/generic/busyinfo.h @@ -7,13 +7,15 @@ // 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/object.h" + class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxWindow; @@ -36,7 +38,5 @@ private: wxDECLARE_NO_COPY_CLASS(wxBusyInfo); }; - #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 1c18dfc9a2..4a1ee4fc7d 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -3,20 +3,19 @@ // Purpose: // Author: Robert Roebling // Created: 01/02/97 -// Id: +// Id: $Id$ // 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/icon.h" class WXDLLIMPEXP_FWD_CORE wxDC; class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxIcon; class WXDLLIMPEXP_FWD_CORE wxColour; @@ -78,5 +77,4 @@ public: }; #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 43f9108c9a..2134b74454 100644 --- 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 -// RCS-ID: $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2009 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/gtk/infobar.h b/include/wx/gtk/infobar.h index 4956925a8b..bd7bdb7f72 100644 --- 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 -// RCS-ID: $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2009 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h index 2c9a5c3cba..1edbbd9b2f 100644 --- a/include/wx/gtk/statbox.h +++ b/include/wx/gtk/statbox.h @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKSTATICBOXH__ -#define __GTKSTATICBOXH__ +#ifndef _WX_GTKSTATICBOX_H_ +#define _WX_GTKSTATICBOX_H_ //----------------------------------------------------------------------------- // wxStaticBox @@ -40,7 +40,7 @@ public: // implementation - virtual bool IsTransparentForMouse() const { return TRUE; } + virtual bool IsTransparentForMouse() const { return true; } virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; @@ -52,8 +52,7 @@ protected: void DoApplyWidgetStyle(GtkRcStyle *style); -private: 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 e6d29419d6..5e881875cc 100644 --- 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_ -class OpaqueEventRef; +struct OpaqueEventRef; typedef OpaqueEventRef *EventRef; class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h index d3a75084d5..a309aea5ac 100644 --- a/include/wx/osx/private.h +++ b/include/wx/osx/private.h @@ -15,4 +15,4 @@ #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 f7d8589a13..eb57d5766b 100644 --- a/include/wx/unix/taskbarx11.h +++ b/include/wx/unix/taskbarx11.h @@ -9,12 +9,8 @@ // 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; @@ -42,5 +38,4 @@ private: 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 7265473d84..12ab1d3d0b 100644 --- a/src/common/taskbarcmn.cpp +++ b/src/common/taskbarcmn.cpp @@ -18,6 +18,8 @@ #if wxUSE_TASKBARICON +#include "wx/taskbar.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") -#include "wx/taskbar.h" - 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 5f6c948bb0..242242c174 100644 --- 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 -// RCS-ID: $Id: wxhead.cpp,v 1.10 2009-06-29 10:23:04 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2009 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -25,6 +25,8 @@ #if wxUSE_INFOBAR +#include "wx/infobar.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/sizer.h" #endif // WX_PRECOMP -#include "wx/infobar.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) diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index e5a8a75d6d..643a622132 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -251,10 +251,8 @@ GtkWidget* wxComboBox::GetConnectWidget() return GTK_WIDGET( GetEntry() ); } -GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const +GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const { - wxUnusedVar(windows); - return GetEntry()->text_area; } diff --git a/src/gtk/sockgtk.cpp b/src/gtk/sockgtk.cpp index 71d26ace50..e887cebb69 100644 --- a/src/gtk/sockgtk.cpp +++ b/src/gtk/sockgtk.cpp @@ -14,12 +14,11 @@ #if wxUSE_SOCKETS -#include -#include - #include "wx/apptrait.h" #include "wx/private/fdiomanager.h" +#include + extern "C" { static void wxSocket_GDK_Input(gpointer data, diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index 6da1bb6c66..b7df8b6f58 100644 --- 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: - m_wxwindow = wxPizza::New( 0 ); + m_wxwindow = wxPizza::New(); 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 46a9c0c8af..96bc244d38 100644 --- 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) ; -#endif break ; +#endif 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 ) ; - char* buf = NULL ; - CFStringEncoding cfencoding = 0; + CFStringEncoding cfencoding; 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 ) ; - buf = new char[ cStrLen ] ; + char* buf = new char[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 3ed74451c3..3448109829 100644 --- 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(); -#endif -#if wxOSX_USE_CARBON +#elif wxOSX_USE_CARBON return new wxOSXCarbonPrintData(); -#endif +#else return NULL; +#endif } /* @@ -659,7 +659,6 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt) { if (sm_abortIt) { - keepGoing = false; break; } else @@ -717,7 +716,7 @@ bool wxMacPrinter::Setup(wxWindow *WXUNUSED(parent)) 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 0b6b77d0e1..08711a0980 100644 --- 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 -wxFORCE_LINK_THIS_MODULE( osxsocket ); +wxFORCE_LINK_THIS_MODULE(osxsocket) #endif // wxUSE_SOCKETS diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp index e3e9f996bc..7c5c828048 100644 --- 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 - 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 @@ -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 - 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 diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp index 25a06fd79e..43006895ab 100644 --- 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 - int lbHeight = 110; + int lbHeight; int wLine; { diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp index ae3328808a..573fd4c6ae 100644 --- 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")); } - if (m_privateContextMenu != NULL) - PopupMenu(m_privateContextMenu); + PopupMenu(m_privateContextMenu); #endif } @@ -828,9 +827,8 @@ void wxTextWidgetImpl::ShowPosition( long WXUNUSED(pos) ) int wxTextWidgetImpl::GetNumberOfLines() const { - ItemCount lines = 0 ; wxString content = GetStringValue() ; - lines = 1; + ItemCount lines = 1; for (size_t i = 0; i < content.length() ; i++) { diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index f9016f4511..23abdab98c 100644 --- 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 ; - if ( 0 ) - { - } #if wxUSE_SCROLLBAR - else if ( IsKindOf( CLASSINFO( wxScrollBar ) ) ) + if ( IsKindOf( CLASSINFO( wxScrollBar ) ) ) { r.height = 16 ; } + else #endif #if wxUSE_SPINBTN - else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) ) + if ( IsKindOf( CLASSINFO( wxSpinButton ) ) ) { r.height = 24 ; } -#endif else +#endif { // return wxWindowBase::DoGetBestSize() ; } diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp index 6f285d7bda..5e469b427a 100644 --- a/src/ribbon/bar.cpp +++ b/src/ribbon/bar.cpp @@ -31,7 +31,7 @@ #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); @@ -210,9 +210,9 @@ void wxRibbonBar::OnMouseMove(wxMouseEvent& evt) 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) \ - { 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) diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp index 3de8011a5c..cfc8fe0931 100644 --- 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_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance); +WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance) class wxRibbonButtonBarLayout { @@ -627,7 +627,7 @@ void wxRibbonButtonBar::CommonInit(long WXUNUSED(style)) m_lock_active_state = false; SetBackgroundStyle(wxBG_STYLE_CUSTOM); -}; +} wxSize wxRibbonButtonBar::GetMinSize() const { @@ -787,7 +787,7 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original, 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; } diff --git a/src/unix/net.cpp b/src/unix/net.cpp index 194f58e6ea..ab4936b946 100644 --- a/src/unix/net.cpp +++ b/src/unix/net.cpp @@ -79,7 +79,7 @@ public: 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 @@ -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. - virtual void SetOnlineStatus(bool isOnline = TRUE) + virtual void SetOnlineStatus(bool isOnline = true) { m_IsOnline = isOnline; } // set misc wxDialUpManager options @@ -180,11 +180,11 @@ public: AutoCheckTimer(wxDialUpManagerImpl *dupman) { m_dupman = dupman; - m_started = FALSE; + m_started = false; } 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(); } @@ -202,7 +202,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp, const wxString & WXUNUSED(password)) { if(m_IsOnline == 1) - return FALSE; + return false; m_IsOnline = -1; m_ISPname = isp; wxString cmd; @@ -217,7 +217,7 @@ bool wxDialUpManagerImpl::HangUp(void) { if(m_IsOnline == 0) - return FALSE; + return false; m_IsOnline = -1; wxString cmd; if(m_HangUpCommand.Find("%s")) -- 2.45.2