From 2c6dbc21b9a5b84c93a1895e65f11ad4cea917d5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 30 Aug 2008 22:01:20 +0000 Subject: [PATCH] no changes, just de-TAB-bed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/html/webkit.h | 4 ++-- include/wx/msgdlg.h | 2 +- include/wx/os2/dc.h | 24 ++++++++++++------------ include/wx/os2/metafile.h | 4 ++-- include/wx/os2/tls.h | 6 +++--- include/wx/osx/carbon/dcclient.h | 10 +++++----- include/wx/osx/carbon/private/mactext.h | 8 ++++---- include/wx/osx/carbon/textctrl.h | 2 +- include/wx/platform.h | 4 ++-- include/wx/vms_x_fix.h | 6 +++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index 7abc5809d2..cff0e53ebe 100644 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -60,9 +60,9 @@ public: bool CanGetPageSource(); wxString GetPageSource(); void SetPageSource(const wxString& source, const wxString& baseUrl = wxEmptyString); - wxString GetPageURL(){ return m_currentURL; } + wxString GetPageURL(){ return m_currentURL; } void SetPageTitle(const wxString& title) { m_pageTitle = title; } - wxString GetPageTitle(){ return m_pageTitle; } + wxString GetPageTitle(){ return m_pageTitle; } // since these worked in 2.6, add wrappers void SetTitle(const wxString& title) { SetPageTitle(title); } diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h index 3a0174e8fb..73339b2349 100644 --- a/include/wx/msgdlg.h +++ b/include/wx/msgdlg.h @@ -116,7 +116,7 @@ protected: #define wxMessageDialog wxGenericMessageDialog #elif defined(__WXCOCOA__) - #include "wx/cocoa/msgdlg.h" + #include "wx/cocoa/msgdlg.h" #elif defined(__WXPALMOS__) #include "wx/palmos/msgdlg.h" #elif defined(__WXMSW__) diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h index d8ced433d8..aff30c67ea 100644 --- a/include/wx/os2/dc.h +++ b/include/wx/os2/dc.h @@ -196,23 +196,23 @@ public: protected: void Init() { - m_pCanvas = NULL; - m_hOldBitmap = 0; - m_hOldPen = 0; - m_hOldBrush = 0; - m_hOldFont = 0; + m_pCanvas = NULL; + m_hOldBitmap = 0; + m_hOldPen = 0; + m_hOldBrush = 0; + m_hOldFont = 0; #if wxUSE_PALETTE m_hOldPalette = 0; #endif // wxUSE_PALETTE - m_bOwnsDC = false; - m_hDC = 0; - m_hOldPS = NULL; - m_hPS = NULL; - m_bIsPaintTime = false; // True at Paint Time + m_bOwnsDC = false; + m_hDC = 0; + m_hOldPS = NULL; + m_hPS = NULL; + m_bIsPaintTime = false; // True at Paint Time - m_pen.SetColour(*wxBLACK); - m_brush.SetColour(*wxWHITE); + m_pen.SetColour(*wxBLACK); + m_brush.SetColour(*wxWHITE); } // create an uninitialized DC: this should be only used by the derived diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index 4e39e32276..ac5f7c6267 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -118,10 +118,10 @@ public: // Supply origin and extent (recommended). // Then don't need to supply them to wxMakeMetaFilePlaceable. wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg) - : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg )) + : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg )) { } - wxMetafile *GetMetafile() const + wxMetafile *GetMetafile() const { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); } virtual ~wxMetafileDC(void) diff --git a/include/wx/os2/tls.h b/include/wx/os2/tls.h index adbfadc409..a70d6aa7df 100644 --- a/include/wx/os2/tls.h +++ b/include/wx/os2/tls.h @@ -24,8 +24,8 @@ public: wxTlsKey() { APIRET rc = ::DosAllocThreadLocalMemory(1, &m_slot); - if (rc != NO_ERROR) - m_slot = NULL; + if (rc != NO_ERROR) + m_slot = NULL; } // return true if the key was successfully allocated @@ -41,7 +41,7 @@ public: bool Set(void *value) { m_slot = (ULONG*)value; - return true; + return true; } // free the key diff --git a/include/wx/osx/carbon/dcclient.h b/include/wx/osx/carbon/dcclient.h index fa518275f1..3c677f99ad 100644 --- a/include/wx/osx/carbon/dcclient.h +++ b/include/wx/osx/carbon/dcclient.h @@ -28,14 +28,14 @@ public: wxWindowDCImpl( wxDC *owner ); wxWindowDCImpl( wxDC *owner, wxWindow *window ); virtual ~wxWindowDCImpl(); - + virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; + virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; protected: bool m_release; - int m_width; - int m_height; + int m_width; + int m_height; DECLARE_CLASS(wxWindowDCImpl) DECLARE_NO_COPY_CLASS(wxWindowDCImpl) @@ -48,7 +48,7 @@ public: wxClientDCImpl( wxDC *owner ); wxClientDCImpl( wxDC *owner, wxWindow *window ); virtual ~wxClientDCImpl(); - + private: DECLARE_CLASS(wxClientDCImpl) DECLARE_NO_COPY_CLASS(wxClientDCImpl) diff --git a/include/wx/osx/carbon/private/mactext.h b/include/wx/osx/carbon/private/mactext.h index a5041087c7..133371f16c 100644 --- a/include/wx/osx/carbon/private/mactext.h +++ b/include/wx/osx/carbon/private/mactext.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 03/02/99 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -58,8 +58,8 @@ public : virtual int GetLineLength(long lineNo) const ; virtual wxString GetLineText(long lineNo) const ; virtual void CheckSpelling(bool WXUNUSED(check)) { } - virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ); -} ; + virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ); +}; class wxMacUnicodeTextControl : public wxMacTextControl { @@ -88,7 +88,7 @@ public : virtual void WriteText(const wxString& str) ; protected : - virtual void CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr ); + virtual void CreateControl( wxTextCtrl* peer, const Rect* bounds, CFStringRef cfr ); // contains the tag for the content (is different for password and non-password controls) OSType m_valueTag ; diff --git a/include/wx/osx/carbon/textctrl.h b/include/wx/osx/carbon/textctrl.h index a2a3eb5e7d..760bc44178 100644 --- a/include/wx/osx/carbon/textctrl.h +++ b/include/wx/osx/carbon/textctrl.h @@ -180,7 +180,7 @@ protected: virtual wxSize DoGetBestSize() const; virtual void CreatePeer(const wxString& str, const wxPoint& pos, const wxSize& size, long style ); - + virtual void DoSetValue(const wxString& value, int flags = 0); bool m_editable; diff --git a/include/wx/platform.h b/include/wx/platform.h index 8c7faf3b32..86b09ff0c2 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -52,8 +52,8 @@ # elif defined(TARGET_OS_MAC) && TARGET_OS_MAC # undef __WXOSX_IPHONE__ # define __WXOSX_MAC__ -# else -# error "unknown SDK, neither TARGET_OS_MAC nor TARGET_OS_IPHONE set in " +# else +# error "unknown SDK, neither TARGET_OS_MAC nor TARGET_OS_IPHONE set in " # endif #endif diff --git a/include/wx/vms_x_fix.h b/include/wx/vms_x_fix.h index 7abe930816..9b8998448d 100644 --- a/include/wx/vms_x_fix.h +++ b/include/wx/vms_x_fix.h @@ -1196,10 +1196,10 @@ #if (__VMS_VER < 80200000) # define SetReqLen(req,n,badlen) \ if ((req->length + n) > (unsigned)65535) { \ - n = badlen; \ - req->length += n; \ + n = badlen; \ + req->length += n; \ } else \ - req->length += n + req->length += n #endif #ifdef __cplusplus -- 2.45.2