No changes, just removed hard tabs and trailing white space.

This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

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

diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h
index df5be1a60b11a72a7b940e810cc793d2e7f66829..86970ae771894c72618d7e92bcda732eb17065bb 100644 (file)
--- a/include/wx/anidecod.h
+++ b/include/wx/anidecod.h
@@ -44,7 +44,7 @@ public:
     virtual wxColour GetTransparentColour(unsigned int frame) const;
 
     // implementation of wxAnimationDecoder's pure virtuals
     virtual wxColour GetTransparentColour(unsigned int frame) const;
 
     // implementation of wxAnimationDecoder's pure virtuals

-    
+

     virtual bool Load( wxInputStream& stream );
 
     bool ConvertToImage(unsigned int frame, wxImage *image) const;
     virtual bool Load( wxInputStream& stream );
 
     bool ConvertToImage(unsigned int frame, wxImage *image) const;


@@ -58,7 +58,7 @@ private:
     // wxAnimationDecoder pure virtual:
     virtual bool DoCanRead( wxInputStream& stream ) const;
             // modifies current stream position (see wxAnimationDecoder::CanRead)
     // wxAnimationDecoder pure virtual:
     virtual bool DoCanRead( wxInputStream& stream ) const;
             // modifies current stream position (see wxAnimationDecoder::CanRead)

-    
+

     // frames stored as wxImage(s): ANI files are meant to be used mostly for animated
     // cursors and thus they do not use any optimization to encode differences between
     // two frames: they are just a list of images to display sequentially.
     // frames stored as wxImage(s): ANI files are meant to be used mostly for animated
     // cursors and thus they do not use any optimization to encode differences between
     // two frames: they are just a list of images to display sequentially.

diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h
index 1c6cb20d1fe8c1f3c1a6163c1ff1a686f4ee066f..acea85d0ec1399c3a28ca7887c517d2fa913f1b2 100644 (file)
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -95,11 +95,11 @@ public:
     }
 
     virtual bool Load( wxInputStream& stream ) = 0;
     }
 
     virtual bool Load( wxInputStream& stream ) = 0;

-    
+

     bool CanRead( wxInputStream& stream ) const
     {
         // NOTE: this code is the same of wxImageHandler::CallDoCanRead
     bool CanRead( wxInputStream& stream ) const
     {
         // NOTE: this code is the same of wxImageHandler::CallDoCanRead

-        
+

         if ( !stream.IsSeekable() )
             return false;        // can't test unseekable stream
 
         if ( !stream.IsSeekable() )
             return false;        // can't test unseekable stream
 


@@ -157,7 +157,7 @@ protected:
     // this function should modify the stream current position without taking care
     // of restoring it since CanRead() will do it.
     virtual bool DoCanRead(wxInputStream& stream) const = 0;
     // this function should modify the stream current position without taking care
     // of restoring it since CanRead() will do it.
     virtual bool DoCanRead(wxInputStream& stream) const = 0;

-    
+

     wxSize m_szAnimation;
     unsigned int m_nFrames;
 
     wxSize m_szAnimation;
     unsigned int m_nFrames;
 

diff --git a/include/wx/aui/floatpane.h b/include/wx/aui/floatpane.h
index 8d95b8cfe3f76defbaa7c49c7d6a2080ae5d834f..2638d6e3a8f8558616d0bd733972c4395d668896 100644 (file)
--- a/include/wx/aui/floatpane.h
+++ b/include/wx/aui/floatpane.h
@@ -37,18 +37,18 @@ public:
                    const wxAuiPaneInfo& pane,
                    wxWindowID id = wxID_ANY,
                    long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
                    const wxAuiPaneInfo& pane,
                    wxWindowID id = wxID_ANY,
                    long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |

-                                wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | 
+                                wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT |

                                 wxCLIP_CHILDREN
                    );
     virtual ~wxAuiFloatingFrame();
     void SetPaneWindow(const wxAuiPaneInfo& pane);
     wxAuiManager* GetOwnerManager() const;
                                 wxCLIP_CHILDREN
                    );
     virtual ~wxAuiFloatingFrame();
     void SetPaneWindow(const wxAuiPaneInfo& pane);
     wxAuiManager* GetOwnerManager() const;

-    
+

 protected:
     virtual void OnMoveStart();
     virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
     virtual void OnMoveFinished();
 protected:
     virtual void OnMoveStart();
     virtual void OnMoving(const wxRect& window_rect, wxDirection dir);
     virtual void OnMoveFinished();

-    
+

 private:
     void OnSize(wxSizeEvent& event);
     void OnClose(wxCloseEvent& event);
 private:
     void OnSize(wxSizeEvent& event);
     void OnClose(wxCloseEvent& event);


@@ -56,7 +56,7 @@ private:
     void OnIdle(wxIdleEvent& event);
     void OnActivate(wxActivateEvent& event);
     static bool isMouseDown();
     void OnIdle(wxIdleEvent& event);
     void OnActivate(wxActivateEvent& event);
     static bool isMouseDown();

-    
+

 private:
     wxWindow* m_pane_window;    // pane window being managed
     bool m_solid_drag;          // true if system uses solid window drag
 private:
     wxWindow* m_pane_window;    // pane window being managed
     bool m_solid_drag;          // true if system uses solid window drag

diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index a6041f2418da8bc317cfa6f6775c4fd04016566c..8dd9e7556d1a05a5257127796a217603a2390c0e 100644 (file)
--- a/include/wx/cairo.h
+++ b/include/wx/cairo.h
@@ -43,13 +43,13 @@ private:
 
     wxCairoLibrary();
     ~wxCairoLibrary();
 
     wxCairoLibrary();
     ~wxCairoLibrary();

-    
+

     bool IsOk();
     bool InitializeMethods();
 
     wxDynamicLibrary m_libCairo;
     wxDynamicLibrary m_libPangoCairo;
     bool IsOk();
     bool InitializeMethods();
 
     wxDynamicLibrary m_libCairo;
     wxDynamicLibrary m_libPangoCairo;

-    
+

     // true if we successfully loaded the libraries and can use them
     //
     // note that this field must have this name as it's used by wxDL_XXX macros
     // true if we successfully loaded the libraries and can use them
     //
     // note that this field must have this name as it's used by wxDL_XXX macros

diff --git a/include/wx/cocoa/NSSlider.h b/include/wx/cocoa/NSSlider.h
index 9dc637dc5e2639a12ad6f8223ae180a849d26d07..f0d06a9b5349096c15cbe8e13a2ebc4576f160a5 100644 (file)
--- a/include/wx/cocoa/NSSlider.h
+++ b/include/wx/cocoa/NSSlider.h
@@ -21,7 +21,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSlider);
 WX_DECLARE_OBJC_HASHMAP(NSSlider);
 
 // For when we're not in Objective-C mode:
 WX_DECLARE_OBJC_HASHMAP(NSSlider);
 
 // For when we're not in Objective-C mode:

-typedef struct objc_selector    *SEL;    
+typedef struct objc_selector    *SEL;

 
 class wxCocoaNSSliderLastSelectorChanger;
 
 
 class wxCocoaNSSliderLastSelectorChanger;
 

diff --git a/include/wx/cocoa/ObjcRef.h b/include/wx/cocoa/ObjcRef.h
index f08c6435ddb62f86dd8470a2ac9eb8f94d8e6d1f..d8361c62c30b747bd840ca94603ad8c128b49732 100644 (file)
--- a/include/wx/cocoa/ObjcRef.h
+++ b/include/wx/cocoa/ObjcRef.h
@@ -2,7 +2,7 @@
 // Name:        wx/cocoa/ObjcRef.h
 // Purpose:     wxObjcAutoRef template class
 // Author:      David Elliott
 // Name:        wx/cocoa/ObjcRef.h
 // Purpose:     wxObjcAutoRef template class
 // Author:      David Elliott

-// Modified by: 
+// Modified by:

 // Created:     2004/03/28
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott <dfe@cox.net>
 // Created:     2004/03/28
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott <dfe@cox.net>


@@ -47,7 +47,7 @@
     wxGCSafeRelease(m_obj); // release current object (if any)
     m_obj = wxGCSafeRetain([[NSObject alloc] init]);
     [m_obj release]; // balance alloc
     wxGCSafeRelease(m_obj); // release current object (if any)
     m_obj = wxGCSafeRetain([[NSObject alloc] init]);
     [m_obj release]; // balance alloc

-    
+

     Consider the effect on the retain count from each statement (alloc, CFRetain, release)
     In RR mode:     retainCount = 1, +1, -1
     In GC mode:     strongRetainCount = 0, +1, -0
     Consider the effect on the retain count from each statement (alloc, CFRetain, release)
     In RR mode:     retainCount = 1, +1, -1
     In GC mode:     strongRetainCount = 0, +1, -0


@@ -150,7 +150,7 @@ protected:
     it will use a method (currently CFRetain/CFRelease) to ensure the object will never be
     finalized until this object is destroyed.
  */
     it will use a method (currently CFRetain/CFRelease) to ensure the object will never be
     finalized until this object is destroyed.
  */

-    
+

 template <class T>
 class wxObjcAutoRefFromAlloc: wxObjcAutoRefBase
 {
 template <class T>
 class wxObjcAutoRefFromAlloc: wxObjcAutoRefBase
 {

diff --git a/include/wx/cocoa/autorelease.h b/include/wx/cocoa/autorelease.h
index eedba0fdba7803f3733dd8c5100718b55edd1ca3..f80e493bdaff945b1e381330424da174ca5fa268 100644 (file)
--- a/include/wx/cocoa/autorelease.h
+++ b/include/wx/cocoa/autorelease.h
@@ -2,7 +2,7 @@
 // Name:        wx/cocoa/autorelease.h
 // Purpose:     Automatic NSAutoreleasePool functionality
 // Author:      David Elliott
 // Name:        wx/cocoa/autorelease.h
 // Purpose:     Automatic NSAutoreleasePool functionality
 // Author:      David Elliott

-// Modified by: 
+// Modified by:

 // Created:     2003/07/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott <dfe@cox.net>
 // Created:     2003/07/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott <dfe@cox.net>

diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h
index 04f9bc31e32b7372ea3accb8f56ecd93d0a740b0..9412469bf617505cb77c61b833286895203cffc7 100644 (file)
--- a/include/wx/cocoa/dirdlg.h
+++ b/include/wx/cocoa/dirdlg.h
@@ -34,7 +34,7 @@ public:
     virtual ~wxDirDialog();
 
     virtual int ShowModal();
     virtual ~wxDirDialog();
 
     virtual int ShowModal();

-    
+

     inline WX_NSSavePanel GetNSSavePanel()
     {   return (WX_NSSavePanel)m_cocoaNSWindow; }
 
     inline WX_NSSavePanel GetNSSavePanel()
     {   return (WX_NSSavePanel)m_cocoaNSWindow; }
 

diff --git a/include/wx/cocoa/filedlg.h b/include/wx/cocoa/filedlg.h
index 62f55618516cc89157c1cf203459f2b1cde6d1ce..bbcc7ca9bbb72cff35e67a255c8f34cbd7f7f404 100644 (file)
--- a/include/wx/cocoa/filedlg.h
+++ b/include/wx/cocoa/filedlg.h
@@ -40,7 +40,7 @@ public:
     virtual void GetFilenames(wxArrayString& files) const;
 
     virtual int ShowModal();
     virtual void GetFilenames(wxArrayString& files) const;
 
     virtual int ShowModal();

-    
+

     inline WX_NSSavePanel GetNSSavePanel()
     {   return (WX_NSSavePanel)m_cocoaNSWindow; }
 
     inline WX_NSSavePanel GetNSSavePanel()
     {   return (WX_NSSavePanel)m_cocoaNSWindow; }
 

diff --git a/include/wx/cocoa/font.h b/include/wx/cocoa/font.h
index ae5686f98d46cc8cd6dbcb98d5db8e7d8d6a07d5..304a72db8da75500c627dad28b9023d9ba9def8b 100644 (file)
--- a/include/wx/cocoa/font.h
+++ b/include/wx/cocoa/font.h
@@ -62,7 +62,7 @@ public:
     {
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -74,7 +74,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     /*! @abstract   Construction with opaque wxNativeFontInfo
      */
     wxFont(const wxNativeFontInfo& info)
     /*! @abstract   Construction with opaque wxNativeFontInfo
      */
     wxFont(const wxNativeFontInfo& info)

diff --git a/include/wx/cocoa/slider.h b/include/wx/cocoa/slider.h
index 32950b547ffabca05f955e47679105d7e8291bfc..0b5e20df709ca80b81acd09224b783ff5f0c7e29 100644 (file)
--- a/include/wx/cocoa/slider.h
+++ b/include/wx/cocoa/slider.h
@@ -92,7 +92,7 @@ public:
     // these methods get/set the length of the slider pointer in pixels
     virtual void SetThumbLength(int lenPixels);
     virtual int GetThumbLength() const;
     // these methods get/set the length of the slider pointer in pixels
     virtual void SetThumbLength(int lenPixels);
     virtual int GetThumbLength() const;

-    
+

     // copied from (wxSliderCocoa.h)
     virtual void SetTickFreq(int n, int pos);
     virtual int GetTickFreq() const;
     // copied from (wxSliderCocoa.h)
     virtual void SetTickFreq(int n, int pos);
     virtual int GetTickFreq() const;

diff --git a/include/wx/cocoa/sound.h b/include/wx/cocoa/sound.h
index 10c3d81893f4e4c76b61f3813815496e44c6118e..63355c870d96112f906ac23fcdf22e33e1b162c7 100644 (file)
--- a/include/wx/cocoa/sound.h
+++ b/include/wx/cocoa/sound.h
@@ -3,7 +3,7 @@
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Authors:     David Elliott, Ryan Norton
 // Purpose:     wxSound class (loads and plays short Windows .wav files).
 //              Optional on non-Windows platforms.
 // Authors:     David Elliott, Ryan Norton

-// Modified by: 
+// Modified by:

 // Created:     2004-10-02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott, Ryan Norton
 // Created:     2004-10-02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott, Ryan Norton


@@ -41,7 +41,7 @@ public:
     void SetNSSound(WX_NSSound cocoaNSSound);
     inline WX_NSSound GetNSSound()
     {   return m_cocoaNSSound; }
     void SetNSSound(WX_NSSound cocoaNSSound);
     inline WX_NSSound GetNSSound()
     {   return m_cocoaNSSound; }

-protected:  
+protected:

     bool DoPlay(unsigned flags) const;
     bool LoadWAV(const wxUint8 *data, size_t length, bool copyData);
 private:
     bool DoPlay(unsigned flags) const;
     bool LoadWAV(const wxUint8 *data, size_t length, bool copyData);
 private:

diff --git a/include/wx/cocoa/tooltip.h b/include/wx/cocoa/tooltip.h
index 42c9abfc35ea624c86b994b628992b57e2a97093..85f944d925cf7162caac3bcb9e56ebfe5f98821f 100644 (file)
--- a/include/wx/cocoa/tooltip.h
+++ b/include/wx/cocoa/tooltip.h
@@ -48,7 +48,7 @@ private:
 
     wxString  m_text;           // tooltip text
     wxWindow *m_window;         // window we're associated with
 
     wxString  m_text;           // tooltip text
     wxWindow *m_window;         // window we're associated with

-    
+

     DECLARE_ABSTRACT_CLASS(wxToolTip)
 };
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
 };
 

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 2ac66cda0a27164822e4aafa98f41a33d2bc0564..a4ae62396ca379277d4ce9ee2d7d138a46fd52dc 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -617,7 +617,7 @@ protected:
 
     // should the focus be reset to the textctrl in idle time?
     bool                    m_resetFocus;
 
     // should the focus be reset to the textctrl in idle time?
     bool                    m_resetFocus;

-    
+

 private:
     void Init();
 
 private:
     void Init();
 

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 4534dcf9f087a9d0918fea0fd5d7942faa0134f4..e0ed69ff5e37b3bab4249b0b03c3cd9e41c73f29 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -217,7 +217,7 @@ public:
   }
 #endif // wxHAS_CONFIG_TEMPLATE_RW
 
   }
 #endif // wxHAS_CONFIG_TEMPLATE_RW
 

-  // convenience functions returning directly the value 
+  // convenience functions returning directly the value

   wxString Read(const wxString& key,
                 const wxString& defVal = wxEmptyString) const
     { wxString s; (void)Read(key, &s, defVal); return s; }
   wxString Read(const wxString& key,
                 const wxString& defVal = wxEmptyString) const
     { wxString s; (void)Read(key, &s, defVal); return s; }

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 7eb724f3957ee00e569910269e1e7c3997c89182..e5d36e86755dcd0b653e7ba80bef07daf3b61017 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -515,7 +515,7 @@ private:
     #include "wx/gtk/dataobj2.h"
     // wxURLDataObject defined in msw/ole/dataobj2.h
 
     #include "wx/gtk/dataobj2.h"
     // wxURLDataObject defined in msw/ole/dataobj2.h
 

-#else 
+#else

     #if defined(__WXGTK__)
         #include "wx/gtk1/dataobj2.h"
     #elif defined(__WXX11__)
     #if defined(__WXGTK__)
         #include "wx/gtk1/dataobj2.h"
     #elif defined(__WXX11__)

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index f379d8a5c650835e151636bb861e5d44dc6dcdd6..478d45b8beb7e5a5ff23d049909df91b420c4faf 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -78,7 +78,7 @@ public:
     wxDataInputStream& operator>>(float& f);
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
     wxDataInputStream& operator>>(float& f);
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }

-    
+

 #if wxUSE_UNICODE
     void SetConv( const wxMBConv &conv );
     wxMBConv *GetConv() const { return m_conv; }
 #if wxUSE_UNICODE
     void SetConv( const wxMBConv &conv );
     wxMBConv *GetConv() const { return m_conv; }

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 364d4358944826f92b171c9e3582a8f074501a6e..de977b7577eed796dd3cd4a59f813044fe5f0dad 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -31,10 +31,10 @@ public:
 #endif
     wxGCDC();
     virtual ~wxGCDC();
 #endif
     wxGCDC();
     virtual ~wxGCDC();

- 
+

     wxGraphicsContext* GetGraphicsContext();
     void SetGraphicsContext( wxGraphicsContext* ctx );
     wxGraphicsContext* GetGraphicsContext();
     void SetGraphicsContext( wxGraphicsContext* ctx );

-    
+

     DECLARE_DYNAMIC_CLASS(wxGCDC)
     wxDECLARE_NO_COPY_CLASS(wxGCDC);
 };
     DECLARE_DYNAMIC_CLASS(wxGCDC)
     wxDECLARE_NO_COPY_CLASS(wxGCDC);
 };


@@ -49,7 +49,7 @@ public:
     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
 #endif
     wxGCDCImpl( wxDC *owner );
     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
 #endif
     wxGCDCImpl( wxDC *owner );

-    
+

     virtual ~wxGCDCImpl();
 
     void Init();
     virtual ~wxGCDCImpl();
 
     void Init();


@@ -65,7 +65,7 @@ public:
 
     virtual void StartPage();
     virtual void EndPage();
 
     virtual void StartPage();
     virtual void EndPage();

-    
+

     // flushing the content of this dc immediately onto screen
     virtual void Flush();
 
     // flushing the content of this dc immediately onto screen
     virtual void Flush();
 


@@ -97,7 +97,7 @@ public:
 
     wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
 
     wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );

-    
+

     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE);
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE);


@@ -150,7 +150,7 @@ public:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,

                         wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,


@@ -195,7 +195,7 @@ protected:
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;

-    
+

     DECLARE_CLASS(wxGCDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
 };
     DECLARE_CLASS(wxGCDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
 };

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index d84d5be6d853c5658b21ce92b4807477e1d6e180..b104fc55ba18bedfb3e97baa1d8c9c381b279da7 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -25,13 +25,13 @@ public:
     wxMemoryDC();
     wxMemoryDC( wxBitmap& bitmap );
     wxMemoryDC( wxDC *dc );
     wxMemoryDC();
     wxMemoryDC( wxBitmap& bitmap );
     wxMemoryDC( wxDC *dc );

-    
+

     // select the given bitmap to draw on it
     void SelectObject(wxBitmap& bmp);
 
     // select the given bitmap for read-only
     void SelectObjectAsSource(const wxBitmap& bmp);
     // select the given bitmap to draw on it
     void SelectObject(wxBitmap& bmp);
 
     // select the given bitmap for read-only
     void SelectObjectAsSource(const wxBitmap& bmp);

-    
+

     // get selected bitmap
     const wxBitmap& GetSelectedBitmap() const;
     wxBitmap& GetSelectedBitmap();
     // get selected bitmap
     const wxBitmap& GetSelectedBitmap() const;
     wxBitmap& GetSelectedBitmap();


@@ -39,7 +39,7 @@ public:
 private:
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };

-    
+

 
 #endif
     // _WX_DCMEMORY_H_BASE_
 
 #endif
     // _WX_DCMEMORY_H_BASE_

diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
index 6ed45a1ab3ce20b44f8286a558b59f1a1eee4d89..98858240b650f42e93fb9f7355fd7d2fe91cfb89 100644 (file)
--- a/include/wx/dcmirror.h
+++ b/include/wx/dcmirror.h
@@ -202,7 +202,7 @@ protected:
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord w, wxCoord h,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord w, wxCoord h,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        wxRasterOperationMode rop = wxCOPY, 
+                        wxRasterOperationMode rop = wxCOPY,

                         bool useMask = false,
                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
     {
                         bool useMask = false,
                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
     {

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 763ccb830b8c2ee29788160683cbd662a04634a2..6b1fc2f2da4e17eaa26fd43b14db31261f2edee2 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -24,7 +24,7 @@ public:
         { return true; }
     static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) =  NULL)
         { return true; }
         { return true; }
     static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) =  NULL)
         { return true; }

-    static bool EndDrawingOnTop() 
+    static bool EndDrawingOnTop()

         { return true; }
 
 private:
         { return true; }
 
 private:

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 45147c68cc83b73a951e8a7d738c9e873ea1c092..cf492e7938160134cacd958cc386ebce052358bf 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -33,11 +33,11 @@ class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {
 public:
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {
 public:

-    wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, 
+    wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,

                      int width=320, int height=240, double dpi=72.0 );
 
     virtual ~wxSVGFileDCImpl();
                      int width=320, int height=240, double dpi=72.0 );
 
     virtual ~wxSVGFileDCImpl();

-    
+

     bool IsOk() const { return m_OK; }
 
     virtual bool CanDrawBitmap() const { return true; }
     bool IsOk() const { return m_OK; }
 
     virtual bool CanDrawBitmap() const { return true; }


@@ -132,7 +132,7 @@ private:
 
    virtual void DoDrawPoint(wxCoord, wxCoord);
 
 
    virtual void DoDrawPoint(wxCoord, wxCoord);
 

-   virtual void DoDrawPolygon(int n, wxPoint points[], 
+   virtual void DoDrawPolygon(int n, wxPoint points[],

                               wxCoord xoffset, wxCoord yoffset,
                               wxPolygonFillMode fillStyle);
 
                               wxCoord xoffset, wxCoord yoffset,
                               wxPolygonFillMode fillStyle);
 


@@ -179,7 +179,7 @@ private:
    }
 
    virtual void DoGetSizeMM( int *width, int *height ) const;
    }
 
    virtual void DoGetSizeMM( int *width, int *height ) const;

-   
+

    virtual wxSize GetPPI() const;
 
    void Init (const wxString &filename, int width, int height, double dpi);
    virtual wxSize GetPPI() const;
 
    void Init (const wxString &filename, int width, int height, double dpi);


@@ -205,12 +205,12 @@ private:
 class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 {
 public:
 class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
 {
 public:

-    wxSVGFileDC(const wxString& filename, 
+    wxSVGFileDC(const wxString& filename,

                 int width = 320,
                 int height = 240,
                 double dpi = 72.0)
         : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi))
                 int width = 320,
                 int height = 240,
                 double dpi = 72.0)
         : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi))

-    { 
+    {

     }
 };
 
     }
 };
 

diff --git a/include/wx/dfb/font.h b/include/wx/dfb/font.h
index def7085e070efb3576b9634401a8e5732557e981..4b485d7f39c011806df735739963f2c9b833ab37 100644 (file)
--- a/include/wx/dfb/font.h
+++ b/include/wx/dfb/font.h
@@ -47,7 +47,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -59,7 +59,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index d3e9e4392d8c8f13bd9848e9b4692c2b8e27e312..51852d49539ca34b05b8c47295fe723f239dddb1 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -55,9 +55,9 @@ enum wxDialogLayoutAdaptationMode
 
 enum wxDialogModality
 {
 
 enum wxDialogModality
 {

-    wxDIALOG_MODALITY_NONE = 0,             
-    wxDIALOG_MODALITY_WINDOW_MODAL = 1,      
-    wxDIALOG_MODALITY_APP_MODAL = 2         
+    wxDIALOG_MODALITY_NONE = 0,
+    wxDIALOG_MODALITY_WINDOW_MODAL = 1,
+    wxDIALOG_MODALITY_APP_MODAL = 2

 };
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 };
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];


@@ -342,8 +342,8 @@ public:
 
     wxDialog *GetDialog() const
         { return wxStaticCast(GetEventObject(), wxDialog); }
 
     wxDialog *GetDialog() const
         { return wxStaticCast(GetEventObject(), wxDialog); }

-        
-    int GetReturnCode() const 
+
+    int GetReturnCode() const

         { return GetDialog()->GetReturnCode(); }
 
     virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }
         { return GetDialog()->GetReturnCode(); }
 
     virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }

diff --git a/include/wx/font.h b/include/wx/font.h
index ee2d28bf477c90c325c3adead644aac5b0387253..225460cda8bdeb31db6ca08e267816a1d2d86c3e 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -113,7 +113,7 @@ class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject
 public:
     /*
         derived classes should provide the following ctors:
 public:
     /*
         derived classes should provide the following ctors:

-    
+

     wxFont();
     wxFont(const wxString& nativeFontInfoString);
     wxFont(const wxNativeFontInfo& info);
     wxFont();
     wxFont(const wxString& nativeFontInfoString);
     wxFont(const wxNativeFontInfo& info);


@@ -132,7 +132,7 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     */
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
     */

-    
+

     // creator function
     virtual ~wxFontBase();
 
     // creator function
     virtual ~wxFontBase();
 

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index e12c021a34086f2026546c64b9549116c9785a59..32c2806104dae0b8fb45752c1f1411ee50641289 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -152,7 +152,7 @@ public:
 
     void Free();
     void EnsureValid();
 
     void Free();
     void EnsureValid();

-    
+

     bool m_descriptorValid;
 #if wxOSX_USE_CORE_TEXT
     CTFontDescriptorRef m_ctFontDescriptor;
     bool m_descriptorValid;
 #if wxOSX_USE_CORE_TEXT
     CTFontDescriptorRef m_ctFontDescriptor;

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 35bee5a82a750286c7383ad7bd659d12c7b20da8..032cd6259011269aa90ecbebf79d59d501842f98 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -135,7 +135,7 @@ public:
 
     // in-place editing
     virtual bool HasEditorCtrl() const;
 
     // in-place editing
     virtual bool HasEditorCtrl() const;

-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, 
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,

                                          const wxVariant &value );
     virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
 
                                          const wxVariant &value );
     virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
 


@@ -260,7 +260,7 @@ public:
     virtual wxSize GetSize() const;
 
     virtual bool HasEditorCtrl() const { return true; }
     virtual wxSize GetSize() const;
 
     virtual bool HasEditorCtrl() const { return true; }

-    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, 
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect,

                                          const wxVariant &value );
     virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
 
                                          const wxVariant &value );
     virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
 


@@ -288,8 +288,8 @@ public:
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize() const;
     virtual bool Activate( wxRect cell,
     virtual bool Render( wxRect cell, wxDC *dc, int state );
     virtual wxSize GetSize() const;
     virtual bool Activate( wxRect cell,

-                           wxDataViewModel *model, 
-                           const wxDataViewItem& item, 
+                           wxDataViewModel *model,
+                           const wxDataViewItem& item,

                            unsigned int col );
 
 private:
                            unsigned int col );
 
 private:


@@ -445,9 +445,9 @@ public:
 
     virtual void EnsureVisible( const wxDataViewItem & item,
                                 const wxDataViewColumn *column = NULL );
 
     virtual void EnsureVisible( const wxDataViewItem & item,
                                 const wxDataViewColumn *column = NULL );

-    virtual void HitTest( const wxPoint & point, wxDataViewItem & item, 
+    virtual void HitTest( const wxPoint & point, wxDataViewItem & item,

                           wxDataViewColumn* &column ) const;
                           wxDataViewColumn* &column ) const;

-    virtual wxRect GetItemRect( const wxDataViewItem & item, 
+    virtual wxRect GetItemRect( const wxDataViewItem & item,

                                 const wxDataViewColumn *column = NULL ) const;
 
     virtual void Expand( const wxDataViewItem & item );
                                 const wxDataViewColumn *column = NULL ) const;
 
     virtual void Expand( const wxDataViewItem & item );

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index bc544c93fec5dc13e5a684eb0c0f1aa941dfd2c0..e33773ddd36ea7d69fc5063674b7b81c2133fb6f 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -95,7 +95,7 @@ public:
     virtual wxRect GetPaperRect() const;
 
 protected:
     virtual wxRect GetPaperRect() const;
 
 protected:

-    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, 
+    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,

                      wxFloodFillStyle style = wxFLOOD_SURFACE);
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
                      wxFloodFillStyle style = wxFLOOD_SURFACE);
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);


@@ -104,11 +104,11 @@ protected:
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);
     void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);
     void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);

-    void DoDrawPolygon(int n, wxPoint points[], 
-                       wxCoord xoffset = 0, wxCoord yoffset = 0, 
+    void DoDrawPolygon(int n, wxPoint points[],
+                       wxCoord xoffset = 0, wxCoord yoffset = 0,

                        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
                        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);

-    void DoDrawPolyPolygon(int n, int count[], wxPoint points[], 
-                           wxCoord xoffset = 0, wxCoord yoffset = 0, 
+    void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+                           wxCoord xoffset = 0, wxCoord yoffset = 0,

                            wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
                            wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);


@@ -117,7 +117,7 @@ protected:
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-                wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+                wxDC *source, wxCoord xsrc, wxCoord ysrc,

                 wxRasterOperationMode rop = wxCOPY, bool useMask = false,
                 wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
                 wxRasterOperationMode rop = wxCOPY, bool useMask = false,
                 wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);

diff --git a/include/wx/generic/statbmpg.h b/include/wx/generic/statbmpg.h
index 010ec66012cedad1ce805813c947eecc3ef80d8e..4a2ece335c12532ca974c1d868532f482f601b1d 100644 (file)
--- a/include/wx/generic/statbmpg.h
+++ b/include/wx/generic/statbmpg.h
@@ -45,9 +45,9 @@ public:
 
     virtual wxBitmap GetBitmap() const { return m_bitmap; }
 
 
     virtual wxBitmap GetBitmap() const { return m_bitmap; }
 

-    virtual void SetIcon(const wxIcon& icon) 
-    { 
-        m_bitmap.CopyFromIcon(icon); 
+    virtual void SetIcon(const wxIcon& icon)
+    {
+        m_bitmap.CopyFromIcon(icon);

         SetInitialSize(GetBitmapSize());
         Refresh();
     }
         SetInitialSize(GetBitmapSize());
         Refresh();
     }


@@ -59,7 +59,7 @@ public:
 
 
 private:
 
 
 private:

-    wxSize GetBitmapSize() 
+    wxSize GetBitmapSize()

     {
         return m_bitmap.Ok() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight())
                              : wxSize(16, 16); // this is completely arbitrary
     {
         return m_bitmap.Ok() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight())
                              : wxSize(16, 16); // this is completely arbitrary

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 98bc85666abd80cd24478d0f34590a2a39175cb3..86f2a905192032ecbc11d055c55fd64385e2f96a 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -258,12 +258,12 @@ protected:
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects

-    
+

     enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;
     enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;

-    wxGenericTreeItem   *m_dndEffectItem; 
-    
+    wxGenericTreeItem   *m_dndEffectItem;
+

     wxTreeTextCtrl      *m_textCtrl;
     wxTreeTextCtrl      *m_textCtrl;

-    
+

 
     wxTimer             *m_renameTimer;
 
 
     wxTimer             *m_renameTimer;
 


@@ -276,7 +276,7 @@ protected:
     // the common part of all ctors
     void Init();
 
     // the common part of all ctors
     void Init();
 

-    // overridden wxWindow methods 
+    // overridden wxWindow methods

     virtual void DoThaw();
 
     // misc helpers
     virtual void DoThaw();
 
     // misc helpers

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 15208231576b9aad2211fba01162ae6ec1808277..908f470ece38f3014b166ab3268ce58ab7775949 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -95,7 +95,7 @@ private:
     wxGIFErrorCode dgif(wxInputStream& stream,
                         GIFImage *img, int interl, int bits);
 
     wxGIFErrorCode dgif(wxInputStream& stream,
                         GIFImage *img, int interl, int bits);
 

-    
+

     // array of all frames
     wxArrayPtrVoid m_frames;
 
     // array of all frames
     wxArrayPtrVoid m_frames;
 

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 6ead07f031aeffcfadc524f81af8ef8cf3093838..9bd0035457a758ace1003905d0c69115a5cebe78 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -118,7 +118,7 @@ public:
     // miscellaneous helper functions
     // ------------------------------
 
     // miscellaneous helper functions
     // ------------------------------
 

-#ifndef wxHAS_OPENGL_ES 
+#ifndef wxHAS_OPENGL_ES

     // call glcolor() for the colour with the given name, return false if
     // colour not found
     bool SetColour(const wxString& colour);
     // call glcolor() for the colour with the given name, return false if
     // colour not found
     bool SetColour(const wxString& colour);

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index d93d63ba413d8350061c7909af9a33ab2f795c63..322e2b769f747d778ea9f6275639adf53fff44eb 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -30,10 +30,10 @@ enum wxCompositionMode
 {
     // R = Result, S = Source, D = Destination, premultiplied with alpha
     // Ra, Sa, Da their alpha components
 {
     // R = Result, S = Source, D = Destination, premultiplied with alpha
     // Ra, Sa, Da their alpha components

-    
+

     // classic Porter-Duff compositions
     // http://keithp.com/~keithp/porterduff/p253-porter.pdf
     // classic Porter-Duff compositions
     // http://keithp.com/~keithp/porterduff/p253-porter.pdf

-    
+

     wxCOMPOSITION_CLEAR, /* R = 0 */
     wxCOMPOSITION_SOURCE, /* R = S */
     wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */
     wxCOMPOSITION_CLEAR, /* R = 0 */
     wxCOMPOSITION_SOURCE, /* R = S */
     wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */


@@ -47,7 +47,7 @@ enum wxCompositionMode
     wxCOMPOSITION_DEST_OUT, /* R = D*(1 - Sa) */
     wxCOMPOSITION_DEST_ATOP, /* R = S*(1 - Da) + D*Sa */
     wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */
     wxCOMPOSITION_DEST_OUT, /* R = D*(1 - Sa) */
     wxCOMPOSITION_DEST_ATOP, /* R = S*(1 - Da) + D*Sa */
     wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */

-    
+

     // mathematical compositions
     wxCOMPOSITION_ADD, /* R = S + D */
 };
     // mathematical compositions
     wxCOMPOSITION_ADD, /* R = S + D */
 };


@@ -390,13 +390,13 @@ public:
 
     // returns the current shape antialiasing mode
     virtual wxAntialiasMode GetAntialiasMode() const { return m_antialias; }
 
     // returns the current shape antialiasing mode
     virtual wxAntialiasMode GetAntialiasMode() const { return m_antialias; }

-    
+

     // sets the antialiasing mode, returns true if it supported
     virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0;
 
     // returns the current compositing operator
     virtual wxCompositionMode GetCompositionMode() const { return m_composition; }
     // sets the antialiasing mode, returns true if it supported
     virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0;
 
     // returns the current compositing operator
     virtual wxCompositionMode GetCompositionMode() const { return m_composition; }

-    
+

     // sets the compositing operator, returns true if it supported
     virtual bool SetCompositionMode(wxCompositionMode op) = 0;
 
     // sets the compositing operator, returns true if it supported
     virtual bool SetCompositionMode(wxCompositionMode op) = 0;
 


@@ -417,7 +417,7 @@ public:
     // all rendering is done into a fully transparent temporary context
     virtual void BeginLayer(wxDouble opacity) = 0;
 
     // all rendering is done into a fully transparent temporary context
     virtual void BeginLayer(wxDouble opacity) = 0;
 

-    // composites back the drawings into the context with the opacity given at 
+    // composites back the drawings into the context with the opacity given at

     // the BeginLayer call
     virtual void EndLayer() = 0;
 
     // the BeginLayer call
     virtual void EndLayer() = 0;
 

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 96f3e2381471ddc04a1ad09778c821640f116e70..32a612d4a9768ecbcdfe4a6ec9e9f210dd335dcf 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -51,9 +51,9 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:
     wxBitmap() { }
 {
 public:
     wxBitmap() { }

-    wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) 
+    wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH )

         { Create(width, height, depth); }
         { Create(width, height, depth); }

-    wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) 
+    wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH )

         { Create(sz, depth); }
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
         { Create(sz, depth); }
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 564975c6556da48f240703007cfefc7e82003e7e..cdd22dec1feee94739dce4b6732097a9a628a4ee 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -32,7 +32,7 @@ public:
     virtual bool CanGetTextExtent() const { return true; }
 
     virtual void DoGetSize(int *width, int *height) const;
     virtual bool CanGetTextExtent() const { return true; }
 
     virtual void DoGetSize(int *width, int *height) const;

-    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, 
+    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,

                               wxFloodFillStyle style=wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 
                               wxFloodFillStyle style=wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 


@@ -58,11 +58,11 @@ public:
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
                                bool useMask = false );
 
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
                                bool useMask = false );
 

-    virtual bool DoBlit( wxCoord xdest, wxCoord ydest, 
+    virtual bool DoBlit( wxCoord xdest, wxCoord ydest,

                          wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,
                          wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                         wxRasterOperationMode logical_func = wxCOPY, 
-                         bool useMask = false, 
+                         wxRasterOperationMode logical_func = wxCOPY,
+                         bool useMask = false,

                          wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
                          wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index ff470015c82cedf04f4023ad7fd2d06901131946..40e3ef2a2defae015d1089c70ba9b461bc9eb7fd 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -23,7 +23,7 @@ public:
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
     wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
     wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );

-    
+

     virtual ~wxMemoryDCImpl();
 
     // these get reimplemented for mono-bitmaps to behave
     virtual ~wxMemoryDCImpl();
 
     // these get reimplemented for mono-bitmaps to behave


@@ -48,12 +48,12 @@ public:
 
 private:
     wxBitmap  m_selected;
 
 private:
     wxBitmap  m_selected;

-    
+

     void Init();
 
     DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
 };
 
     void Init();
 
     DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl)
 };
 

-#endif 
+#endif

     // _WX_GTK_DCMEMORY_H_
 
     // _WX_GTK_DCMEMORY_H_
 

diff --git a/include/wx/gtk/evtloop.h b/include/wx/gtk/evtloop.h
index 79cb753185edb892bba583eb9fb0f608f6b84fed..f6225fe851180f913fae85d649722619c97915da 100644 (file)
--- a/include/wx/gtk/evtloop.h
+++ b/include/wx/gtk/evtloop.h
@@ -32,7 +32,7 @@ public:
 
     void StoreGdkEventForLaterProcessing(GdkEvent* ev)
         { m_arrGdkEvents.Add(ev); }
 
     void StoreGdkEventForLaterProcessing(GdkEvent* ev)
         { m_arrGdkEvents.Add(ev); }

-    
+

 protected:
 
     // the exit code of this event loop
 protected:
 
     // the exit code of this event loop

diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index e194bfc49fa41ae26f4de1162ce3bfec3d362b15..e84fff83f4f7bdeb693fe05cc0663b85aa9ca0cb 100644 (file)
--- a/include/wx/gtk/filectrl.h
+++ b/include/wx/gtk/filectrl.h
@@ -55,7 +55,7 @@ private:
     GtkFileChooser *m_widget;
     // First wildcard in filter, to be used when the user
     // saves a file without giving an extension.
     GtkFileChooser *m_widget;
     // First wildcard in filter, to be used when the user
     // saves a file without giving an extension.

-    wxArrayString   m_wildcards; 
+    wxArrayString   m_wildcards;

 };
 
 #if wxUSE_FILECTRL
 };
 
 #if wxUSE_FILECTRL

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 8e03364bcaffb468964acfe30383c2c4fb82f6dc..0f446d745c795a3289fc66ddc143189d0a04bf31 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -62,7 +62,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h
index 182b5e316b0a2141393dceef1cbbaafd5bd73753..82d8ad3ea66356d158a4deb867fa2e706dce481e 100644 (file)
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -250,7 +250,7 @@ public:
     void SetPalette(const wxPalette& WXUNUSED(palette)) { }
 
 protected:
     void SetPalette(const wxPalette& WXUNUSED(palette)) { }
 
 protected:

-    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, 
+    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,

                     wxFloodFillStyle style=wxFLOOD_SURFACE );
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
                     wxFloodFillStyle style=wxFLOOD_SURFACE );
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);


@@ -268,7 +268,7 @@ protected:
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-            wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+            wxDC *source, wxCoord xsrc, wxCoord ysrc,

             wxRasterOperationMode = wxCOPY, bool useMask = false,
             wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
             wxRasterOperationMode = wxCOPY, bool useMask = false,
             wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );

diff --git a/include/wx/gtk/gnome/gvfs.h b/include/wx/gtk/gnome/gvfs.h
index 6d65e6f977aaa8ad4619cf3d24a6d5f36840c783..40d72508d7da87f8129dbd71d40e2429c8b2d473 100644 (file)
--- a/include/wx/gtk/gnome/gvfs.h
+++ b/include/wx/gtk/gnome/gvfs.h
@@ -48,6 +48,6 @@ public:
 };
 
 #endif
 };
 
 #endif

-  // wxUSE_MIMETYPE 
+  // wxUSE_MIMETYPE

 
 #endif
 
 #endif

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index bb7aa4b0c9741facd994f775a6157616433b361f..ecc2e52679b2bbb3e8355e8adfeccf9449142aa7 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -26,7 +26,7 @@ public:
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
     virtual bool Show(bool show = true);
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
     virtual bool Show(bool show = true);

-    
+

     virtual void SetFocus();
 
     // implementation
     virtual void SetFocus();
 
     // implementation

diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h
index 0082aa12db40f094c455f5ea730b4d48a8a2d525..de57b609798abfa6d385a29746ff02a88aa9f61f 100644 (file)
--- a/include/wx/gtk/print.h
+++ b/include/wx/gtk/print.h
@@ -255,7 +255,7 @@ public:
     virtual wxRect GetPaperRect() const;
 
 protected:
     virtual wxRect GetPaperRect() const;
 
 protected:

-    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, 
+    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,

                      wxFloodFillStyle style=wxFLOOD_SURFACE );
     void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter);
     void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST);
                      wxFloodFillStyle style=wxFLOOD_SURFACE );
     void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter);
     void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST);


@@ -275,7 +275,7 @@ protected:
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     void DoDrawSpline(const wxPointList *points);
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-            wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+            wxDC *source, wxCoord xsrc, wxCoord ysrc,

             wxRasterOperationMode rop = wxCOPY, bool useMask = false,
             wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
             wxRasterOperationMode rop = wxCOPY, bool useMask = false,
             wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index e465f0011f8abc0643c25643c4f51cd3eb986070..9fbbba8ea2eaf376925ea0b499f43ef8915cee77 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -35,7 +35,7 @@ public:
         InitRect(rect.x, rect.y, rect.width, rect.height);
     }
 
         InitRect(rect.x, rect.y, rect.width, rect.height);
     }
 

-    wxRegion( size_t n, const wxPoint *points, 
+    wxRegion( size_t n, const wxPoint *points,

               wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
 
 #if wxUSE_IMAGE
               wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
 
 #if wxUSE_IMAGE

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index d66010cb08a532444019789bcd5abfc6494e124b..8b8c61e32caa638731e719faea5c19c06a3c03f1 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -56,7 +56,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

 protected:
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 protected:
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index 5449e2add7f647249710734f249c0c423e636968..c9d3bc31ed1afc2b901af97b1bfae43deec0d486 100644 (file)
--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -44,7 +44,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

     virtual bool Enable( bool enable = true );
 
     // implementation
     virtual bool Enable( bool enable = true );
 
     // implementation


@@ -55,7 +55,7 @@ public:
 protected:
     void GtkDisableEvents() const;
     void GtkEnableEvents() const;
 protected:
     void GtkDisableEvents() const;
     void GtkEnableEvents() const;

-    
+

     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     virtual wxSize DoGetBestSize() const;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

diff --git a/include/wx/gtk/statbmp.h b/include/wx/gtk/statbmp.h
index d1194eb19379d9d93c87e65c17ac190fba9b15d5..54fcd6788018dbb9fd0a2ecb3b05100134cde7d7 100644 (file)
--- a/include/wx/gtk/statbmp.h
+++ b/include/wx/gtk/statbmp.h
@@ -49,7 +49,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

 private:
     wxBitmap   m_bitmap;
 
 private:
     wxBitmap   m_bitmap;
 

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index b216e24143475eeb8ab9ea4b9b7dd9d37b152df4..2c9a5c3cbacf3bc9ee5889ac88ed331710436eff 100644 (file)
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -51,7 +51,7 @@ protected:
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 
     void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
 
     void DoApplyWidgetStyle(GtkRcStyle *style);

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };

diff --git a/include/wx/gtk/treeentry_gtk.h b/include/wx/gtk/treeentry_gtk.h
index 785339934ed24f463f946c41648f7ba522cd6cef..0992d2174ee90424bbd8e2de54fe6cc3f8951019 100644 (file)
--- a/include/wx/gtk/treeentry_gtk.h
+++ b/include/wx/gtk/treeentry_gtk.h
@@ -65,7 +65,7 @@ WXDLLIMPEXP_CORE
 void   gtk_tree_entry_set_userdata      (GtkTreeEntry* entry, gpointer userdata);
 
 WXDLLIMPEXP_CORE
 void   gtk_tree_entry_set_userdata      (GtkTreeEntry* entry, gpointer userdata);
 
 WXDLLIMPEXP_CORE

-void   gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry, 
+void   gtk_tree_entry_set_destroy_func (GtkTreeEntry* entry,

                                         GtkTreeEntryDestroy destroy_func,
                                         gpointer destroy_func_data);
 
                                         GtkTreeEntryDestroy destroy_func,
                                         gpointer destroy_func_data);
 

diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 0686c3934f2cd0992c902a55cbbd8c0bc7968ecd..068bb1a3425d5e4bddfc7f8bab18ee490ed67b67 100644 (file)
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -63,7 +63,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -75,7 +75,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index e14142c5ebece42e0a10b548a0ec588c2645c6bc..a54dceb21173b535c494c9f895b314450a24e18d 100644 (file)
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -89,7 +89,7 @@ public:
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index );

-    
+

 protected:
     virtual int DoGetImageCount( wxInputStream& stream );
     virtual bool DoCanRead( wxInputStream& stream );
 protected:
     virtual int DoGetImageCount( wxInputStream& stream );
     virtual bool DoCanRead( wxInputStream& stream );

diff --git a/include/wx/image.h b/include/wx/image.h
index bc0a60e61da4917d3a4431c95f3bf0e227804c8e..03c1ea2210f694f4d5365642c27e49cd0eb55bde 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -100,10 +100,10 @@ public:
 #if wxUSE_STREAMS
     // NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes
     //       to implement only one of the two
 #if wxUSE_STREAMS
     // NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes
     //       to implement only one of the two

-    virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), 
+    virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream),

                            bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 )
         { return false; }
                            bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 )
         { return false; }

-    virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), 
+    virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream),

                            bool WXUNUSED(verbose)=true )
         { return false; }
 
                            bool WXUNUSED(verbose)=true )
         { return false; }
 


@@ -135,9 +135,9 @@ protected:
 #if wxUSE_STREAMS
     // NOTE: this function is allowed to change the current stream position
     //       since GetImageCount() will take care of restoring it later
 #if wxUSE_STREAMS
     // NOTE: this function is allowed to change the current stream position
     //       since GetImageCount() will take care of restoring it later

-    virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) ) 
+    virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) )

         { return 1; }       // default return value is 1 image
         { return 1; }       // default return value is 1 image

-    
+

     // NOTE: this function is allowed to change the current stream position
     //       since CallDoCanRead() will take care of restoring it later
     virtual bool DoCanRead( wxInputStream& stream ) = 0;
     // NOTE: this function is allowed to change the current stream position
     //       since CallDoCanRead() will take care of restoring it later
     virtual bool DoCanRead( wxInputStream& stream ) = 0;


@@ -275,7 +275,7 @@ public:
     bool Create( int width, int height, bool clear = true );
     bool Create( int width, int height, unsigned char* data, bool static_data = false );
     bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
     bool Create( int width, int height, bool clear = true );
     bool Create( int width, int height, unsigned char* data, bool static_data = false );
     bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );

-    
+

     // Create() variants using wxSize:
     bool Create( const wxSize& sz, bool clear = true )
         { return Create(sz.GetWidth(), sz.GetHeight(), clear); }
     // Create() variants using wxSize:
     bool Create( const wxSize& sz, bool clear = true )
         { return Create(sz.GetWidth(), sz.GetHeight(), clear); }


@@ -285,7 +285,7 @@ public:
         { return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); }
 
     void Destroy();
         { return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); }
 
     void Destroy();

-   
+

     // initialize the image data with zeroes
     void Clear(unsigned char value = 0);
 
     // initialize the image data with zeroes
     void Clear(unsigned char value = 0);
 

diff --git a/include/wx/log.h b/include/wx/log.h
index 86e9f40d5fa986274492bf8419e1b91f5bd7f697..c95749977a8217865310716bf11c231c220102c8 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -1307,7 +1307,7 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
         wxDO_LOG(level)
 
 // wxLogFatalError() is special as it can't be disabled
         wxDO_LOG(level)
 
 // wxLogFatalError() is special as it can't be disabled

-#define wxLogFatalError wxDO_LOG(FatalError) 
+#define wxLogFatalError wxDO_LOG(FatalError)

 #define wxVLogFatalError(format, argptr) wxDO_LOGV(FatalError, format, argptr)
 
 #define wxLogError wxDO_LOG_IF_ENABLED(Error)
 #define wxVLogFatalError(format, argptr) wxDO_LOGV(FatalError, format, argptr)
 
 #define wxLogError wxDO_LOG_IF_ENABLED(Error)

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 466d50675a656c0682d13791183416ec065fc745..876a72e1622568fa47dcd0538b11bb2b48c9d803 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -499,7 +499,7 @@ public:
 #if WXWIN_COMPATIBILITY_2_8
     // get or change the label of the menu at given position
     // Deprecated in favour of SetMenuLabel
 #if WXWIN_COMPATIBILITY_2_8
     // get or change the label of the menu at given position
     // Deprecated in favour of SetMenuLabel

-    wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );    
+    wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );

     // Deprecated in favour of GetMenuLabelText
     wxDEPRECATED( wxString GetLabelTop(size_t pos) const );
 #endif
     // Deprecated in favour of GetMenuLabelText
     wxDEPRECATED( wxString GetLabelTop(size_t pos) const );
 #endif

diff --git a/include/wx/meta/convertible.h b/include/wx/meta/convertible.h
index d43fc2c74de5ac6277eb64087cbd2f70b4560ad5..1b46f7f21dc8d57bd1b13122c2a09e30638683b5 100644 (file)
--- a/include/wx/meta/convertible.h
+++ b/include/wx/meta/convertible.h
@@ -17,8 +17,8 @@
 template <class D, class B>
 struct wxConvertibleTo_SizeHelper
 {
 template <class D, class B>
 struct wxConvertibleTo_SizeHelper
 {

-       static char Match(B* pb);
-       static int  Match(...);
+    static char Match(B* pb);
+    static int  Match(...);

 };
 
 // Helper to decide if an object of type D is convertible to type B (the test
 };
 
 // Helper to decide if an object of type D is convertible to type B (the test


@@ -26,8 +26,13 @@ struct wxConvertibleTo_SizeHelper
 template <class D, class B>
 struct wxConvertibleTo
 {
 template <class D, class B>
 struct wxConvertibleTo
 {

-    enum { value = sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))==sizeof(char)
-       };
+    enum
+    {
+        value =
+            sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))
+            ==
+            sizeof(char)
+    };

 };
 
 #endif // _WX_META_CONVERTIBLE_H_
 };
 
 #endif // _WX_META_CONVERTIBLE_H_

diff --git a/include/wx/meta/if.h b/include/wx/meta/if.h
index 82e6d3b13587f63e10efa5e4333fa926abf1167e..931591cd4811a1afe6b2200f15392f2ecbf488ea 100644 (file)
--- a/include/wx/meta/if.h
+++ b/include/wx/meta/if.h
@@ -57,7 +57,7 @@ struct wxIfImpl<false>
 
 } // namespace wxPrivate
 
 
 } // namespace wxPrivate
 

-// wxIf<> template defines nested type "value" which is the same as 
+// wxIf<> template defines nested type "value" which is the same as

 // TTrue if the condition Cond (boolean compile-time constant) was met and
 // TFalse if it wasn't.
 //
 // TTrue if the condition Cond (boolean compile-time constant) was met and
 // TFalse if it wasn't.
 //

diff --git a/include/wx/meta/int2type.h b/include/wx/meta/int2type.h
index 1f18ced67aa703f0c0b462560232684f74d7b86b..4de64938039c4e16054eadb428420638d35a05f8 100644 (file)
--- a/include/wx/meta/int2type.h
+++ b/include/wx/meta/int2type.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/meta/int2type.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/meta/int2type.h

-// Purpose:     Generate a unique type from a constant integer 
+// Purpose:     Generate a unique type from a constant integer

 // Author:      Arne Steinarson
 // Created:     2008-01-10
 // RCS-ID:      $Id$
 // Author:      Arne Steinarson
 // Created:     2008-01-10
 // RCS-ID:      $Id$

diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
index c02989c3ce41d5d880c99780b381d49c694fb129..9ec0e6fd0f9d1011938078133d5c0fff250b7eed 100644 (file)
--- a/include/wx/mgl/dcmemory.h
+++ b/include/wx/mgl/dcmemory.h
@@ -42,7 +42,7 @@ public:
 
     // implementation
     wxBitmap  m_selected;
 
     // implementation
     wxBitmap  m_selected;

-    
+

     wxBitmap GetSelectedObject() const { return m_selected; }
 
 protected:
     wxBitmap GetSelectedObject() const { return m_selected; }
 
 protected:

diff --git a/include/wx/mgl/dcscreen.h b/include/wx/mgl/dcscreen.h
index bfc9985a7c9a1585922711f455ae0981132b6075..ccf1c218e9744420455815415ed545d99bb83e93 100644 (file)
--- a/include/wx/mgl/dcscreen.h
+++ b/include/wx/mgl/dcscreen.h
@@ -31,7 +31,7 @@ public:
     static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; }
     static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; }
     static bool EndDrawingOnTop() { return TRUE; }
     static bool StartDrawingOnTop(wxWindow *WXUNUSED(window)) { return TRUE; }
     static bool StartDrawingOnTop(wxRect *WXUNUSED(rect) = NULL) { return TRUE; }
     static bool EndDrawingOnTop() { return TRUE; }

-  
+

 private:
     DECLARE_DYNAMIC_CLASS(wxScreenDC)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxScreenDC)
 };

diff --git a/include/wx/mgl/font.h b/include/wx/mgl/font.h
index a94a28c3eaa026f1a1a0acbfab0f59ba96c82846..93802a8dd8ca9e8c676978e3ca677efb328e2294 100644 (file)
--- a/include/wx/mgl/font.h
+++ b/include/wx/mgl/font.h
@@ -60,7 +60,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -72,7 +72,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/mgl/popupwin.h b/include/wx/mgl/popupwin.h
index 8d524187476fc68d740b706f257d1f658b70cb7c..dea9211249814a0aa4e163cf30e03b0fe8072ca9 100644 (file)
--- a/include/wx/mgl/popupwin.h
+++ b/include/wx/mgl/popupwin.h
@@ -31,7 +31,7 @@ public:
                                 (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
     }
 
                                 (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
     }
 

-protected:    
+protected:

     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index d7b49260da88673336773fa9f2a42fc30452fe7c..e47eda9a3c4f2eb03d23be74c3a8a47cdf0d2e5f 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -410,7 +410,7 @@ public:
 
     static void Set( wxMimeTypesManagerFactory *factory );
     static wxMimeTypesManagerFactory *Get();
 
     static void Set( wxMimeTypesManagerFactory *factory );
     static wxMimeTypesManagerFactory *Get();

-    
+

 private:
     static wxMimeTypesManagerFactory *m_factory;
 };
 private:
     static wxMimeTypesManagerFactory *m_factory;
 };

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 80f86980ae7c6fe0d7d9996534d11ac356c2ba82..53f0c3a4d5bc47c72e1e26bbce7c76e6b91cae2d 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -53,7 +53,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -65,7 +65,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index dffa117b6a7d92b582a0ff502e026c475a9c2b5b..e8205c4a218e5ca329fd9a0d4231248c55e12862 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -215,7 +215,7 @@ public:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,

                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 166ace2792f875772ad6238a4deffc43b35be704..672615162717b6fc658d848f357aafe20b44bd37 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -106,7 +106,7 @@ class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
 {
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
 {
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);

-    
+

     DECLARE_CLASS(wxPaintDCEx)
     wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
 };
     DECLARE_CLASS(wxPaintDCEx)
     wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
 };

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 49c5475de22a7c5a76b81d5846ddd22f3b750fab..01c0b5229d46e0f10f0165b27ab3c98abb3dd3d1 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -27,7 +27,7 @@ public:
     virtual void DoGetSize(int* width, int* height) const;
     virtual void DoSelect(const wxBitmap& bitmap);
 
     virtual void DoGetSize(int* width, int* height) const;
     virtual void DoSelect(const wxBitmap& bitmap);
 

-    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const 
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const

     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}
 
 protected:
     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}
 
 protected:

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index afadf95e08412b5cac5048010a7e90b088ecda59..a121282f89569465fbd276348b885bbc25b28e2f 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -47,7 +47,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 3845d20ff86a506087dea8de03adbc79ec1ff319..233ecdc6039479860b092c6b7ac37fa887c5e2bd 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -30,18 +30,18 @@ class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();

-    
+

     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );

-    
+

     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;

-    
+

     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }
     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }

-   
+

 private:
     void* m_devMode;
     void* m_devNames;
 private:
     void* m_devMode;
     void* m_devNames;


@@ -51,7 +51,7 @@ private:
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };

-    
+

 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------


@@ -76,11 +76,11 @@ private:
     wxPrinterDC*      m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
     wxPrinterDC*      m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;

-    
+

 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );
 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );

-    
+

     // holds MSW handle
     void*             m_printDlg;
 
     // holds MSW handle
     void*             m_printDlg;
 


@@ -90,7 +90,7 @@ private:
 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------

-// wxWindowsPageSetupDialog: the MSW page setup dialog 
+// wxWindowsPageSetupDialog: the MSW page setup dialog

 // ---------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
 // ---------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase


@@ -110,7 +110,7 @@ public:
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;

-    
+

     // holds MSW handle
     void*                   m_pageDlg;
 
     // holds MSW handle
     void*                   m_pageDlg;
 

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 551b632f289d731835f0d439da79fb94ff8c05b9..01715a13c6450a20c6aa651ee5aebae0d33cc688 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -123,7 +123,7 @@ protected:
     WXHWND     m_hwndBuddy;
     WXFARPROC  m_wndProcBuddy;
 
     WXHWND     m_hwndBuddy;
     WXFARPROC  m_wndProcBuddy;
 

-    // Block text update event after SetValue()    
+    // Block text update event after SetValue()

     bool m_blockEvent;
 
     // all existing wxSpinCtrls - this allows to find the one corresponding to
     bool m_blockEvent;
 
     // all existing wxSpinCtrls - this allows to find the one corresponding to

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 1da13fffd280cedf9560ef8376881f488955edf3..8f3f531615ee0422f4c7cf843c9b81552d4e78a7 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -108,7 +108,7 @@ public:
 
     // Implementation from now on
     // --------------------------
 
     // Implementation from now on
     // --------------------------

- 
+

 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index b155af512b636a774a55caf8404838607b0e41a0..803f9d8a32d2abeabaebd935114002e9c99710dc 100644 (file)
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -59,12 +59,12 @@ public:
 
 protected:
     void Init();
 
 protected:
     void Init();

-    
+

     wxBitmap  m_bitmap;
     wxBitmap  m_disabledBitmap;
     bool      m_capturing;
     bool      m_depressed,m_oldValue;
     wxBitmap  m_bitmap;
     wxBitmap  m_disabledBitmap;
     bool      m_capturing;
     bool      m_depressed,m_oldValue;

-    
+

     void OnPaint(wxPaintEvent &event);
     void OnMouse(wxMouseEvent &event);
     void OnChar(wxKeyEvent &event);
     void OnPaint(wxPaintEvent &event);
     void OnMouse(wxMouseEvent &event);
     void OnChar(wxKeyEvent &event);

diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index 25ffd75738ca2be38c845090f0f2e3843bdd2828..c720ae3dc2aa4916b5fec9355ae57993f00bff53 100644 (file)
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -23,10 +23,10 @@ public:
     // ctor & dtor
     wxToolTip(const wxString &tip);
     virtual ~wxToolTip();
     // ctor & dtor
     wxToolTip(const wxString &tip);
     virtual ~wxToolTip();

-    
+

     // ctor used by wxStatusBar to associate a tooltip to a portion of
     // the status bar window:
     // ctor used by wxStatusBar to associate a tooltip to a portion of
     // the status bar window:

-    wxToolTip(wxWindow* win, unsigned int id, 
+    wxToolTip(wxWindow* win, unsigned int id,

               const wxString &tip, const wxRect& rc);
 
     // accessors
               const wxString &tip, const wxRect& rc);
 
     // accessors

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 4026e7ea06009443287a3035679eeebd5e529114..51a09d5579dce373361b189ec5889850b1d32df6 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -444,9 +444,9 @@ public:
 
     // check if a native double-buffering applies for this window
     virtual bool IsDoubleBuffered() const;
 
     // check if a native double-buffering applies for this window
     virtual bool IsDoubleBuffered() const;

-    
+

     void SetDoubleBuffered(bool on);
     void SetDoubleBuffered(bool on);

-    
+

     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();
 
     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();
 

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index f6e1a0f8a4e05b27493128babb3b30b9d7ff4c50..52347d15041cdd4c183f928d381c4ec8b50032b6 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -72,10 +72,10 @@
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 

-// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability 
+// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability

 // in the WINAPI SDK (they are an integral type that is the size of a
 // in the WINAPI SDK (they are an integral type that is the size of a

-// pointer) on MSVC 7 and later. However, they are not available in older 
-// Platform SDKs, and since they are typedefs and not #defines we simply 
+// pointer) on MSVC 7 and later. However, they are not available in older
+// Platform SDKs, and since they are typedefs and not #defines we simply

 // overwrite them if there is a chance that they're not defined
 #if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__)
     #define UINT_PTR unsigned int
 // overwrite them if there is a chance that they're not defined
 #if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__)
     #define UINT_PTR unsigned int

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index b7d02925a0b8db849e12fafb6f0d0d9a63d50f40..818bb4907139af9373f27338c7fe0a7627e6bb47 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -165,7 +165,7 @@ public:
                        );
     virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
                        );
     virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }

-        
+

     virtual bool Create( const void* pData
                         ,wxBitmapType lType
                         ,int   nWidth
     virtual bool Create( const void* pData
                         ,wxBitmapType lType
                         ,int   nWidth

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index 10ca985c09b3618d6436a82fa802b2593b1b00c7..a67943ccc7c4b732bd37234883747ea0c3912778 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/include/wx/os2/dcmemory.h
@@ -26,7 +26,7 @@ public:
     virtual void DoGetSize(int* pWidth, int* pHeight) const;
     virtual void DoSelect(const wxBitmap& bitmap);
 
     virtual void DoGetSize(int* pWidth, int* pHeight) const;
     virtual void DoSelect(const wxBitmap& bitmap);
 

-    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const 
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const

     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);}
 
 protected:
     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);}
 
 protected:

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index ef692625d2a3f6f5e0ce0d01b50c0ceb29a70c17..3c14bf884bd77a8e5a73a385734ef78edfa91b0c 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -50,7 +50,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -62,7 +62,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/os2/listctrl.h b/include/wx/os2/listctrl.h
index ddece5a697aad61587522fbce6d2d83910d39105..6c3a69371e83d445f515f0357b817a4002c9cbf4 100644 (file)
--- a/include/wx/os2/listctrl.h
+++ b/include/wx/os2/listctrl.h
@@ -1,9 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/os2/listctrl.h
 // Purpose:     wxListCtrl class
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/os2/listctrl.h
 // Purpose:     wxListCtrl class

-// Author:      
+// Author:

 // Modified by:
 // Modified by:

-// Created:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence


@@ -507,7 +507,7 @@ protected:
 
     //
     // Return the icon for the given item. In report view, OnGetItemImage will
 
     //
     // Return the icon for the given item. In report view, OnGetItemImage will

-    // only be called for the first column. See OnGetItemColumnImage for 
+    // only be called for the first column. See OnGetItemColumnImage for

     // details.
     //
     virtual int OnGetItemImage(long lItem) const;
     // details.
     //
     virtual int OnGetItemImage(long lItem) const;

diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h
index 2b6c07a54c7541939e5f6105988483a3dd852d60..bef454b4609b2325c9dca8091a9d178b70870a26 100644 (file)
--- a/include/wx/os2/sound.h
+++ b/include/wx/os2/sound.h
@@ -33,7 +33,7 @@ public:
 
 protected:
   bool  Free();
 
 protected:
   bool  Free();

-  
+

   bool  DoPlay(unsigned flags) const;
 
 private:
   bool  DoPlay(unsigned flags) const;
 
 private:

diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index df98620825d7b39504cd58e887fffbc5d6d49838..9cb9bb70ce5e0f9a0e31c38ed25b4741f4299cc9 100644 (file)
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -23,7 +23,7 @@ public:
         {
             SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
         }
         {
             SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
         }

-    
+

     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,


@@ -40,7 +40,7 @@ public:
                 const wxString& name = wxButtonNameStr);
 
 protected:
                 const wxString& name = wxButtonNameStr);
 
 protected:

-    virtual wxSize DoGetBestSize() const;    
+    virtual wxSize DoGetBestSize() const;

 
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
 
 
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
 

diff --git a/include/wx/osx/carbon/chkconf.h b/include/wx/osx/carbon/chkconf.h
index b88b06c73bd8033650ff7add56213c7502c7b8cd..f9109f2bbf713049218050663d289b318208dc76 100644 (file)
--- a/include/wx/osx/carbon/chkconf.h
+++ b/include/wx/osx/carbon/chkconf.h
@@ -27,8 +27,8 @@
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 

-/* 
- * text rendering system 
+/*
+ * text rendering system

  */
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
  */
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5

diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h
index 336c577f23dda5a416da268671295a3744b975c8..7f6962328dfc600ee7c504b68362772a37b4e0c0 100644 (file)
--- a/include/wx/osx/carbon/dataview.h
+++ b/include/wx/osx/carbon/dataview.h
@@ -41,7 +41,7 @@ public:
   {
     return this->m_PropertyID;
   }
   {
     return this->m_PropertyID;
   }

-  
+

   void SetPropertyID(DataBrowserPropertyID newPropertyID)
   {
     this->m_PropertyID = newPropertyID;
   void SetPropertyID(DataBrowserPropertyID newPropertyID)
   {
     this->m_PropertyID = newPropertyID;


@@ -189,7 +189,7 @@ public:
   OSStatus GetPropertyFlags (DataBrowserPropertyID propertyID, DataBrowserPropertyFlags *flags ) const;
   OSStatus GetPropertyID    (DataBrowserItemDataRef itemData, DataBrowserPropertyID* propertyID) const; // returns for the passed item data reference the corresponding property ID
   OSStatus GetPropertyID    (DataBrowserTableViewColumnIndex index, DataBrowserPropertyID* propertyID) const; // returns for the passed column index the corresponding property ID
   OSStatus GetPropertyFlags (DataBrowserPropertyID propertyID, DataBrowserPropertyFlags *flags ) const;
   OSStatus GetPropertyID    (DataBrowserItemDataRef itemData, DataBrowserPropertyID* propertyID) const; // returns for the passed item data reference the corresponding property ID
   OSStatus GetPropertyID    (DataBrowserTableViewColumnIndex index, DataBrowserPropertyID* propertyID) const; // returns for the passed column index the corresponding property ID

-  
+

   OSStatus IsUsedPropertyID(DataBrowserPropertyID propertyID) const; // checks if passed property id is used by the control; no error is returned if the id exists
 
   OSStatus RemoveColumnByProperty(DataBrowserTableViewColumnID propertyID);
   OSStatus IsUsedPropertyID(DataBrowserPropertyID propertyID) const; // checks if passed property id is used by the control; no error is returned if the id exists
 
   OSStatus RemoveColumnByProperty(DataBrowserTableViewColumnID propertyID);


@@ -270,7 +270,7 @@ public:
 // container handling
 //
   OSStatus CloseContainer(DataBrowserItemID containerID);
 // container handling
 //
   OSStatus CloseContainer(DataBrowserItemID containerID);

-  
+

   OSStatus OpenContainer(DataBrowserItemID containerID);
 
 protected :
   OSStatus OpenContainer(DataBrowserItemID containerID);
 
 protected :


@@ -315,7 +315,7 @@ protected :
 // event handler for hit testing
 ///
   void*  m_macDataViewCtrlEventHandler;
 // event handler for hit testing
 ///
   void*  m_macDataViewCtrlEventHandler;

-  
+

 private:
 //
 // wxWidget internal stuff
 private:
 //
 // wxWidget internal stuff

diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h
index 19fafff74fa53c47a956318a01cb548f8df3114c..027d7a8a427fa31be885c4a54778287193f7fa08 100644 (file)
--- a/include/wx/osx/carbon/private.h
+++ b/include/wx/osx/carbon/private.h
@@ -302,12 +302,12 @@ public :
     virtual bool        IsVisible() const;
 
     virtual void        Raise();
     virtual bool        IsVisible() const;
 
     virtual void        Raise();

-    
+

     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
 
     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
 

-    virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;    
+    virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;

     virtual void        Move(int x, int y, int width, int height);
     virtual void        GetPosition( int &x, int &y ) const;
     virtual void        GetSize( int &width, int &height ) const;
     virtual void        Move(int x, int y, int width, int height);
     virtual void        GetPosition( int &x, int &y ) const;
     virtual void        GetSize( int &width, int &height ) const;


@@ -316,7 +316,7 @@ public :
     // where is in native window relative coordinates
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;
     // where is in native window relative coordinates
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;

- 
+

     virtual bool        CanFocus() const;
     // return true if successful
     virtual bool        SetFocus();
     virtual bool        CanFocus() const;
     // return true if successful
     virtual bool        SetFocus();


@@ -324,7 +324,7 @@ public :
 
     void                RemoveFromParent();
     void                Embed( wxWidgetImpl *parent );
 
     void                RemoveFromParent();
     void                Embed( wxWidgetImpl *parent );

-    
+

     void                SetDefaultButton( bool isDefault );
     void                PerformClick();
     void                SetLabel( const wxString& title, wxFontEncoding encoding );
     void                SetDefaultButton( bool isDefault );
     void                PerformClick();
     void                SetLabel( const wxString& title, wxFontEncoding encoding );


@@ -369,7 +369,7 @@ public :
 
     virtual wxInt32 GetMaximum() const;
     virtual wxInt32 GetMinimum() const;
 
     virtual wxInt32 GetMaximum() const;
     virtual wxInt32 GetMinimum() const;

- 
+

     virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum );
     virtual void SetRange( SInt32 minimum , SInt32 maximum );
 
     virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum );
     virtual void SetRange( SInt32 minimum , SInt32 maximum );
 


@@ -451,7 +451,7 @@ public :
 
 
     virtual void GetFeatures( UInt32 *features );
 
 
     virtual void GetFeatures( UInt32 *features );

-   
+

     // to be moved into a tab control class
 
     virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable );
     // to be moved into a tab control class
 
     virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable );


@@ -640,7 +640,7 @@ public :
 } ;
 */
 
 } ;
 */
 

-class WXDLLIMPEXP_CORE wxMacDataItem 
+class WXDLLIMPEXP_CORE wxMacDataItem

 {
 public :
     wxMacDataItem();
 {
 public :
     wxMacDataItem();


@@ -817,7 +817,7 @@ protected :
 class WXDLLIMPEXP_CORE wxMacDataBrowserColumn : public wxListWidgetColumn
 {
 public :
 class WXDLLIMPEXP_CORE wxMacDataBrowserColumn : public wxListWidgetColumn
 {
 public :

-    wxMacDataBrowserColumn( DataBrowserPropertyID propertyId, DataBrowserPropertyType colType, bool editable ) 
+    wxMacDataBrowserColumn( DataBrowserPropertyID propertyId, DataBrowserPropertyType colType, bool editable )

         : m_property(propertyId), m_editable(editable), m_type( colType )
     {
     }
         : m_property(propertyId), m_editable(editable), m_type( colType )
     {
     }


@@ -825,9 +825,9 @@ public :
     {
     }
     DataBrowserPropertyID GetProperty() const { return m_property ; }
     {
     }
     DataBrowserPropertyID GetProperty() const { return m_property ; }

-    
+

     bool IsEditable() const { return m_editable; }
     bool IsEditable() const { return m_editable; }

-    
+

     DataBrowserPropertyType GetType() const { return m_type; }
 
 protected :
     DataBrowserPropertyType GetType() const { return m_type; }
 
 protected :


@@ -844,12 +844,12 @@ class WXDLLIMPEXP_CORE wxMacDataBrowserCellValue : public wxListWidgetCellValue
 public :
     wxMacDataBrowserCellValue(DataBrowserItemDataRef data) : m_data(data) {}
     virtual ~wxMacDataBrowserCellValue() {}
 public :
     wxMacDataBrowserCellValue(DataBrowserItemDataRef data) : m_data(data) {}
     virtual ~wxMacDataBrowserCellValue() {}

-    
+

     virtual void Set( CFStringRef value );
     virtual void Set( const wxString& value );
     virtual void Set( int value ) ;
     virtual void Check( bool check );
     virtual void Set( CFStringRef value );
     virtual void Set( const wxString& value );
     virtual void Set( int value ) ;
     virtual void Check( bool check );

-    
+

     virtual int GetIntValue() const ;
     virtual wxString GetStringValue() const ;
 protected :
     virtual int GetIntValue() const ;
     virtual wxString GetStringValue() const ;
 protected :


@@ -868,10 +868,10 @@ public:
 
     wxListWidgetColumn*     InsertTextColumn( unsigned int pos, const wxString& title, bool editable = false,
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
 
     wxListWidgetColumn*     InsertTextColumn( unsigned int pos, const wxString& title, bool editable = false,
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;

-    wxListWidgetColumn*     InsertCheckColumn( unsigned int pos , const wxString& title, bool editable = false, 
+    wxListWidgetColumn*     InsertCheckColumn( unsigned int pos , const wxString& title, bool editable = false,

                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
 
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
 

-    wxMacDataBrowserColumn* DoInsertColumn( unsigned int pos, DataBrowserPropertyID property, 
+    wxMacDataBrowserColumn* DoInsertColumn( unsigned int pos, DataBrowserPropertyID property,

                                 const wxString& title, bool editable,
                                 DataBrowserPropertyType colType, SInt16 just, int width );
     // add and remove
                                 const wxString& title, bool editable,
                                 DataBrowserPropertyType colType, SInt16 just, int width );
     // add and remove


@@ -1000,51 +1000,51 @@ public :
     wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowCarbonImpl();
     virtual ~wxNonOwnedWindowCarbonImpl();
     wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowCarbonImpl();
     virtual ~wxNonOwnedWindowCarbonImpl();

-    
+

     virtual void Destroy() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;
     virtual void Destroy() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;

-    
+

     WXWindow GetWXWindow() const;
     WXWindow GetWXWindow() const;

-    void Raise();    
+    void Raise();

     void Lower();
     void Lower();

-    bool Show(bool show);    
+    bool Show(bool show);

     bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
     bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);

-        
+

 
     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
 
     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );

-    void SetExtraStyle( long exStyle );    
-    bool SetBackgroundStyle(wxBackgroundStyle style);    
+    void SetExtraStyle( long exStyle );
+    bool SetBackgroundStyle(wxBackgroundStyle style);

     bool CanSetTransparent();
     void MoveWindow(int x, int y, int width, int height);
     void GetPosition( int &x, int &y ) const;
     void GetSize( int &width, int &height ) const;
     bool CanSetTransparent();
     void MoveWindow(int x, int y, int width, int height);
     void GetPosition( int &x, int &y ) const;
     void GetSize( int &width, int &height ) const;

-    void GetContentArea( int &left , int &top , int &width , int &height ) const;    
+    void GetContentArea( int &left , int &top , int &width , int &height ) const;

 
     bool SetShape(const wxRegion& region);
 
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
 
     bool SetShape(const wxRegion& region);
 
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;

-    
+

     virtual bool IsMaximized() const;
     virtual bool IsMaximized() const;

-    
+

     virtual bool IsIconized() const;
     virtual bool IsIconized() const;

-    
+

     virtual void Iconize( bool iconize );
     virtual void Iconize( bool iconize );

-    
+

     virtual void Maximize(bool maximize);
     virtual void Maximize(bool maximize);

-    
+

     virtual bool IsFullScreen() const;
     virtual bool IsFullScreen() const;

-    
+

     virtual bool ShowFullScreen(bool show, long style);
 
     virtual void RequestUserAttention(int flags);
     virtual bool ShowFullScreen(bool show, long style);
 
     virtual void RequestUserAttention(int flags);

-    
+

     virtual void ScreenToWindow( int *x, int *y );
     virtual void ScreenToWindow( int *x, int *y );

-    
+

     virtual void WindowToScreen( int *x, int *y );
     virtual void WindowToScreen( int *x, int *y );

-    
+

 
     bool MacGetUnifiedAppearance() const ;
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
 
     bool MacGetUnifiedAppearance() const ;
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;


@@ -1052,18 +1052,18 @@ public :
     void MacSetMetalAppearance( bool set ) ;
     bool MacGetMetalAppearance() const ;
     void MacSetUnifiedAppearance( bool set );
     void MacSetMetalAppearance( bool set ) ;
     bool MacGetMetalAppearance() const ;
     void MacSetUnifiedAppearance( bool set );

-    
+

     WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
 
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     void                MacInstallTopLevelWindowEventHandler();
     WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
 
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     void                MacInstallTopLevelWindowEventHandler();

-    
+

     WXEVENTHANDLERREF   m_macEventHandler ;
     WindowRef           m_macWindow;
     void *              m_macFullScreenData ;
     WXEVENTHANDLERREF   m_macEventHandler ;
     WindowRef           m_macWindow;
     void *              m_macFullScreenData ;

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)    
-};    
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
+};

 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

diff --git a/include/wx/osx/carbon/private/overlay.h b/include/wx/osx/carbon/private/overlay.h
index b3b7608b03981b4146e4d87a7ab1da24c50a1853..60dd892c06fe25c16a164ce007946fae1488f7fc 100644 (file)
--- a/include/wx/osx/carbon/private/overlay.h
+++ b/include/wx/osx/carbon/private/overlay.h
@@ -21,34 +21,34 @@ class wxOverlayImpl
 public:
     wxOverlayImpl() ;
     ~wxOverlayImpl() ;
 public:
     wxOverlayImpl() ;
     ~wxOverlayImpl() ;

-    
-    
+
+

     // clears the overlay without restoring the former state
     // to be done eg when the window content has been changed and repainted
     void Reset();
     // clears the overlay without restoring the former state
     // to be done eg when the window content has been changed and repainted
     void Reset();

-    
+

     // returns true if it has been setup
     bool IsOk();
     // returns true if it has been setup
     bool IsOk();

-    
+

     void Init( wxDC* dc, int x , int y , int width , int height );
     void Init( wxDC* dc, int x , int y , int width , int height );

-    
+

     void BeginDrawing( wxDC* dc);
     void BeginDrawing( wxDC* dc);

-    
+

     void EndDrawing( wxDC* dc);
     void EndDrawing( wxDC* dc);

-    
+

     void Clear( wxDC* dc);
 
 private:
     OSStatus CreateOverlayWindow();
     void Clear( wxDC* dc);
 
 private:
     OSStatus CreateOverlayWindow();

-    
+

     void MacGetBounds( Rect *bounds );
     void MacGetBounds( Rect *bounds );

-    
+

     WindowRef m_overlayWindow;
     WindowRef m_overlayParentWindow;
     CGContextRef m_overlayContext ;
     // we store the window in case we would have to issue a Refresh()
     wxWindow* m_window ;
     WindowRef m_overlayWindow;
     WindowRef m_overlayParentWindow;
     CGContextRef m_overlayContext ;
     // we store the window in case we would have to issue a Refresh()
     wxWindow* m_window ;

-    
+

     int m_x ;
     int m_y ;
     int m_width ;
     int m_x ;
     int m_y ;
     int m_width ;

diff --git a/include/wx/osx/carbon/private/print.h b/include/wx/osx/carbon/private/print.h
index a53482fd17a781faf89973ff25b083e7d8bc7e92..1babdfce0e06a899f5c85da664ca041051aed00a 100644 (file)
--- a/include/wx/osx/carbon/private/print.h
+++ b/include/wx/osx/carbon/private/print.h
@@ -34,10 +34,10 @@ public:
 
     virtual void            TransferFrom( wxPrintDialogData * );
     virtual void            TransferTo( wxPrintDialogData * );
 
     virtual void            TransferFrom( wxPrintDialogData * );
     virtual void            TransferTo( wxPrintDialogData * );

-    
-    PMPrintSession          GetPrintSession() { return m_macPrintSession; } 
-    PMPageFormat            GetPageFormat() { return m_macPageFormat; } 
-    PMPrintSettings         GetPrintSettings() { return m_macPrintSettings; } 
+
+    PMPrintSession          GetPrintSession() { return m_macPrintSession; }
+    PMPageFormat            GetPageFormat() { return m_macPageFormat; }
+    PMPrintSettings         GetPrintSettings() { return m_macPrintSettings; }

 protected :
     virtual void            UpdateFromPMState();
     virtual void            UpdateToPMState();
 protected :
     virtual void            UpdateFromPMState();
     virtual void            UpdateToPMState();

diff --git a/include/wx/osx/carbon/statbmp.h b/include/wx/osx/carbon/statbmp.h
index 17d38360f5e00d386e2cf9152bf139338683cf0d..1a37192cfe4da750616dc7dbcf6593c1a43081b4 100644 (file)
--- a/include/wx/osx/carbon/statbmp.h
+++ b/include/wx/osx/carbon/statbmp.h
@@ -58,7 +58,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
     virtual wxSize DoGetBestSize() const;
 
     wxBitmap m_bitmap;
     virtual wxSize DoGetBestSize() const;
 
     wxBitmap m_bitmap;

-    DECLARE_EVENT_TABLE() 
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h
index 2751c3f8fa546cacfad45d71b4ac3bc133a64d5b..871f1b9597873d902174262c8883a5667aae5bb8 100644 (file)
--- a/include/wx/osx/checkbox.h
+++ b/include/wx/osx/checkbox.h
@@ -37,7 +37,7 @@ public:
     virtual void Command(wxCommandEvent& event);
 
     // osx specific event handling common for all osx-ports
     virtual void Command(wxCommandEvent& event);
 
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool        OSXHandleClicked( double timestampsec );
 protected:
     void DoSet3StateValue(wxCheckBoxState val);
     virtual bool        OSXHandleClicked( double timestampsec );
 protected:
     void DoSet3StateValue(wxCheckBoxState val);

diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h
index 5e2fb9774b5de004f04edbce5baedfacee211780..5927fbabd32f5b34ba06df958e141482aa12b408 100644 (file)
--- a/include/wx/osx/checklst.h
+++ b/include/wx/osx/checklst.h
@@ -81,7 +81,7 @@ protected:
 
     // the array containing the checked status of the items
     wxArrayInt m_checks;
 
     // the array containing the checked status of the items
     wxArrayInt m_checks;

-    
+

     wxListWidgetColumn* m_checkColumn ;
 
     void Init();
     wxListWidgetColumn* m_checkColumn ;
 
     void Init();

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index b353b1c0343a0a90d87956708f9a16c60407f051..243b9899e74fd741cbbcbfd8d05d1709fc0bc6ce 100644 (file)
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -40,7 +40,7 @@
  * we only use core graphics now on all builds, try to catch attempts
  * to configure the build otherwise and give error messages
  */
  * we only use core graphics now on all builds, try to catch attempts
  * to configure the build otherwise and give error messages
  */

- 
+

 #if !wxUSE_GRAPHICS_CONTEXT || ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS )
 #   error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely"
 #endif
 #if !wxUSE_GRAPHICS_CONTEXT || ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS )
 #   error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely"
 #endif


@@ -48,7 +48,7 @@
 /*
  * using mixins of cocoa functionality
  */
 /*
  * using mixins of cocoa functionality
  */

- 
+

 #ifdef __WXOSX_COCOA__
     #define wxOSX_USE_COCOA 1
 #else
 #ifdef __WXOSX_COCOA__
     #define wxOSX_USE_COCOA 1
 #else


@@ -83,7 +83,7 @@
 /*
  * combination flags
  */
 /*
  * combination flags
  */

- 
+

 #if wxOSX_USE_COCOA || wxOSX_USE_CARBON
     #define wxOSX_USE_COCOA_OR_CARBON 1
 #else
 #if wxOSX_USE_COCOA || wxOSX_USE_CARBON
     #define wxOSX_USE_COCOA_OR_CARBON 1
 #else

diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index c69ab6693157c21785998caeeaa7e3982a750ff5..20421e046cdc6b023959bcf333871b1cbfba999e 100644 (file)
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.h
@@ -77,7 +77,7 @@ public:
     virtual wxString GetString(unsigned int n) const ;
     virtual void SetString(unsigned int pos, const wxString& s);
     // osx specific event handling common for all osx-ports
     virtual wxString GetString(unsigned int n) const ;
     virtual void SetString(unsigned int pos, const wxString& s);
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:
     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:

diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h
index 868eeb5ca3a61b4b7b1571018ec69d18290c22bd..47717d721ec9da2a7914fda4cd3bacebaddf76d2 100644 (file)
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -20,8 +20,8 @@
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 
     #define wxOSX_USE_NATIVE_TOOLBAR 1
 #endif
 

-/* 
- * text rendering system 
+/*
+ * text rendering system

  */
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
  */
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5

diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h
index 25a60f38f338f3db9b557f59bf4caa3300e692e1..52537708651431376ad9901d68814f6e0474d89d 100644 (file)
--- a/include/wx/osx/cocoa/dataview.h
+++ b/include/wx/osx/cocoa/dataview.h
@@ -104,7 +104,7 @@ public:
   {
     return this->m_NativeColumnPtr;
   }
   {
     return this->m_NativeColumnPtr;
   }

-  
+

   void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr)
   {
     this->m_NativeColumnPtr = newNativeColumnPtr;
   void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr)
   {
     this->m_NativeColumnPtr = newNativeColumnPtr;


@@ -235,11 +235,11 @@ private:
   NSMutableArray* children; // buffered children
 
   NSMutableSet* items; // stores all items that are in use by the control
   NSMutableArray* children; // buffered children
 
   NSMutableSet* items; // stores all items that are in use by the control

-  
+

   wxCocoaDataViewControl* implementation;
   wxCocoaDataViewControl* implementation;

-  
+

   wxDataViewModel* model;
   wxDataViewModel* model;

-  
+

   wxPointerObject* currentParentItem; // parent of the buffered children; the object is owned
 }
 
   wxPointerObject* currentParentItem; // parent of the buffered children; the object is owned
 }
 


@@ -338,11 +338,11 @@ private:
 @private
   CGFloat xImageShift;    // shift for the image in x-direction from border
   CGFloat spaceImageText; // space between image and text ("belongs" to the image)
 @private
   CGFloat xImageShift;    // shift for the image in x-direction from border
   CGFloat spaceImageText; // space between image and text ("belongs" to the image)

-  
+

   NSImage* image; // the image itself
   NSImage* image; // the image itself

-  
+

   NSSize imageSize; // largest size of the image; default size is (16, 16)
   NSSize imageSize; // largest size of the image; default size is (16, 16)

-  
+

   NSTextAlignment cellAlignment; // the text alignment is used to align the whole
                                  // cell (image and text)
 }
   NSTextAlignment cellAlignment; // the text alignment is used to align the whole
                                  // cell (image and text)
 }

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index ec69ce31d02824ae2c5071ba8b94c2377b094ad6..c8adede96941b2c8d78b7a4f9dbad32f55cb5570 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -60,17 +60,17 @@ WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname
 class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
 {
 public :
 class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
 {
 public :

-    wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;    
-    wxWidgetCocoaImpl() ;    
-    ~wxWidgetCocoaImpl();    
-    
+    wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+    wxWidgetCocoaImpl() ;
+    ~wxWidgetCocoaImpl();
+

     void Init();
     void Init();

-    
+

     virtual bool        IsVisible() const ;
     virtual void        SetVisibility(bool);
 
     virtual void        Raise();
     virtual bool        IsVisible() const ;
     virtual void        SetVisibility(bool);
 
     virtual void        Raise();

-    
+

     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );


@@ -124,11 +124,11 @@ public :
     void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
 
     void                InstallEventHandler( WXWidget control = NULL );
     void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
 
     void                InstallEventHandler( WXWidget control = NULL );

-    
-    virtual bool        DoHandleMouseEvent(NSEvent *event); 
+
+    virtual bool        DoHandleMouseEvent(NSEvent *event);

     virtual bool        DoHandleKeyEvent(NSEvent *event);
     virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
     virtual bool        DoHandleKeyEvent(NSEvent *event);
     virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);

-    virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow); 
+    virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);

 
     void                SetFlipped(bool flipped);
     virtual bool        IsFlipped() const { return m_isFlipped; }
 
     void                SetFlipped(bool flipped);
     virtual bool        IsFlipped() const { return m_isFlipped; }


@@ -149,7 +149,7 @@ public :
     virtual void                resetCursorRects(WXWidget slf, void* _cmd);
     virtual bool                isFlipped(WXWidget slf, void* _cmd);
     virtual void                drawRect(void* rect, WXWidget slf, void* _cmd);
     virtual void                resetCursorRects(WXWidget slf, void* _cmd);
     virtual bool                isFlipped(WXWidget slf, void* _cmd);
     virtual void                drawRect(void* rect, WXWidget slf, void* _cmd);

-    
+

     virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
     virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
 
     virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
     virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
 


@@ -158,9 +158,9 @@ protected:
     NSEvent* m_lastKeyDownEvent;
     bool m_isFlipped;
     // if it the control has an editor, that editor will already send some
     NSEvent* m_lastKeyDownEvent;
     bool m_isFlipped;
     // if it the control has an editor, that editor will already send some

-    // events, don't resend them 
+    // events, don't resend them

     bool m_hasEditor;
     bool m_hasEditor;

-    
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 };
 


@@ -171,59 +171,59 @@ class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
 public :
     wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowCocoaImpl();
 public :
     wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowCocoaImpl();

-    
+

     virtual ~wxNonOwnedWindowCocoaImpl();
     virtual ~wxNonOwnedWindowCocoaImpl();

-    
+

     virtual void Destroy() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;
     virtual void Destroy() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;

-    
+

     WXWindow GetWXWindow() const;
     WXWindow GetWXWindow() const;

-    void Raise();    
+    void Raise();

     void Lower();
     void Lower();

-    bool Show(bool show);    
+    bool Show(bool show);

     bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
     bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);

-        
+

     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );

-    void SetExtraStyle( long exStyle );    
-    bool SetBackgroundStyle(wxBackgroundStyle style);    
+    void SetExtraStyle( long exStyle );
+    bool SetBackgroundStyle(wxBackgroundStyle style);

     bool CanSetTransparent();
 
     void MoveWindow(int x, int y, int width, int height);
     void GetPosition( int &x, int &y ) const;
     void GetSize( int &width, int &height ) const;
 
     bool CanSetTransparent();
 
     void MoveWindow(int x, int y, int width, int height);
     void GetPosition( int &x, int &y ) const;
     void GetSize( int &width, int &height ) const;
 

-    void GetContentArea( int &left , int &top , int &width , int &height ) const;    
+    void GetContentArea( int &left , int &top , int &width , int &height ) const;

     bool SetShape(const wxRegion& region);
     bool SetShape(const wxRegion& region);

-    
+

     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;

-    
+

     virtual bool IsMaximized() const;
     virtual bool IsMaximized() const;

-    
+

     virtual bool IsIconized() const;
     virtual bool IsIconized() const;

-    
+

     virtual void Iconize( bool iconize );
     virtual void Iconize( bool iconize );

-    
+

     virtual void Maximize(bool maximize);
     virtual void Maximize(bool maximize);

-    
+

     virtual bool IsFullScreen() const;
     virtual bool IsFullScreen() const;

-    
+

     virtual bool ShowFullScreen(bool show, long style);
 
     virtual void RequestUserAttention(int flags);
     virtual bool ShowFullScreen(bool show, long style);
 
     virtual void RequestUserAttention(int flags);

-    
+

     virtual void ScreenToWindow( int *x, int *y );
     virtual void ScreenToWindow( int *x, int *y );

-    
+

     virtual void WindowToScreen( int *x, int *y );
     virtual void WindowToScreen( int *x, int *y );

-    
+

     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     WX_wxNSWindow         m_macWindow;
     void *              m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     WX_wxNSWindow         m_macWindow;
     void *              m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)

-};    
+};

 
 #ifdef __OBJC__
 
 
 #ifdef __OBJC__
 


@@ -231,16 +231,16 @@ protected :
     WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
     WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
     WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );
     WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
     WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
     WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );

-    
-    NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , 
+
+    NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,

         bool adjustForOrigin = true );
         bool adjustForOrigin = true );

-        
+

     // used for many wxControls
     // used for many wxControls

-    
+

     @interface wxNSButton : NSButton
     {
     }
     @interface wxNSButton : NSButton
     {
     }

-    
+

     @end
 
     @interface wxNSBox : NSBox
     @end
 
     @interface wxNSBox : NSBox


@@ -276,7 +276,7 @@ protected :
     @interface wxNSTextView : NSTextView
     {
     }
     @interface wxNSTextView : NSTextView
     {
     }

-    
+

     @end
 
     @interface wxNSMenu : NSMenu
     @end
 
     @interface wxNSMenu : NSMenu


@@ -287,7 +287,7 @@ protected :
     - (void) setImplementation:(wxMenuImpl*) item;
     - (wxMenuImpl*) implementation;
 
     - (void) setImplementation:(wxMenuImpl*) item;
     - (wxMenuImpl*) implementation;
 

-    @end 
+    @end

 
     @interface wxNSMenuItem : NSMenuItem
     {
 
     @interface wxNSMenuItem : NSMenuItem
     {


@@ -300,8 +300,8 @@ protected :
     - (void)clickedAction:(id)sender;
     - (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
 
     - (void)clickedAction:(id)sender;
     - (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
 

-    @end 
-    
+    @end
+

     void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
 
     /*
     void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
 
     /*

diff --git a/include/wx/osx/cocoa/private/textimpl.h b/include/wx/osx/cocoa/private/textimpl.h
index 98962b3157d981ff299dddba801f88d5a1e7ca64..b405b19b1cc9aaf08cd9e89c7ac74cee4cd5441c 100644 (file)
--- a/include/wx/osx/cocoa/private/textimpl.h
+++ b/include/wx/osx/cocoa/private/textimpl.h
@@ -32,7 +32,7 @@ public :
     virtual void GetSelection( long* from, long* to) const ;
     virtual void SetSelection( long from , long to );
     virtual void WriteText(const wxString& str) ;
     virtual void GetSelection( long* from, long* to) const ;
     virtual void SetSelection( long from , long to );
     virtual void WriteText(const wxString& str) ;

-    
+

     virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
 protected :
     NSTextField* m_textField;
     virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
 protected :
     NSTextField* m_textField;

diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index bacb7ee8ee84533c56f0563dd1de0eb5b2413da4..b861bc14a5c59f07ee09c583d7ee6c5a6824e6d6 100644 (file)
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -2,7 +2,7 @@
 // Name:        config_xcode.pch
 // Purpose:     configurations for xcode builds
 // Author:      Stefan Csomor
 // Name:        config_xcode.pch
 // Purpose:     configurations for xcode builds
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     29.04.04
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     29.04.04
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team


@@ -135,7 +135,7 @@
 #define HAVE_STDLIB_H 1
 
 // OBSOLETE ?
 #define HAVE_STDLIB_H 1
 
 // OBSOLETE ?

- 
+

 #define HAVE_COS 1
 #define HAVE_FLOOR 1
 #define HAVE_INTTYPES_H 1
 #define HAVE_COS 1
 #define HAVE_FLOOR 1
 #define HAVE_INTTYPES_H 1

diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h
index 8a9d7e8c812c134b021a3acea852bde803a1a857..8ae84173001cf0cadf2fe5065519a6deb9594bcf 100644 (file)
--- a/include/wx/osx/core/cfdataref.h
+++ b/include/wx/osx/core/cfdataref.h
@@ -2,7 +2,7 @@
 // Name:        wx/mac/corefoundation/cfdata.h
 // Purpose:     wxCFDataRef class
 // Author:      Stefan Csomor
 // Name:        wx/mac/corefoundation/cfdata.h
 // Purpose:     wxCFDataRef class
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     2007/05/10
 // RCS-ID:      $Id: cfdataref.h 46095 2007-05-18 07:29:49Z SC $
 // Copyright:   (c) 2007 Stefan Csomor
 // Created:     2007/05/10
 // RCS-ID:      $Id: cfdataref.h 46095 2007-05-18 07:29:49Z SC $
 // Copyright:   (c) 2007 Stefan Csomor


@@ -33,7 +33,7 @@ public:
     {}
 
     typedef wxCFRef<CFDataRef> super_type;
     {}
 
     typedef wxCFRef<CFDataRef> super_type;

-    
+

     /*! @method     wxCFDataRef
         @abstract   Assumes ownership of p and creates a reference to it.
         @templatefield otherType    Any type.
     /*! @method     wxCFDataRef
         @abstract   Assumes ownership of p and creates a reference to it.
         @templatefield otherType    Any type.


@@ -65,7 +65,7 @@ public:
         @param data The raw data.
         @param length The data length.
     */
         @param data The raw data.
         @param length The data length.
     */

-    wxCFDataRef(const UInt8* data, CFIndex length) 
+    wxCFDataRef(const UInt8* data, CFIndex length)

     : super_type(CFDataCreate(kCFAllocatorDefault, data, length))
     {
     }
     : super_type(CFDataCreate(kCFAllocatorDefault, data, length))
     {
     }


@@ -80,7 +80,7 @@ public:
         else
             return 0;
     }
         else
             return 0;
     }

-    
+

     /*! @method     GetBytes
         @abstract   Copies the data into an external buffer
         @param range The desired range.
     /*! @method     GetBytes
         @abstract   Copies the data into an external buffer
         @param range The desired range.

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index e60bb91548338acb492a545476f0e95a957b68c2..60949ad65e6f9be483f33509427d84040d7711ee 100644 (file)
--- a/include/wx/osx/core/cfstring.h
+++ b/include/wx/osx/core/cfstring.h
@@ -49,18 +49,18 @@ public:
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     wxCFStringRef(NSString* ref)
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     wxCFStringRef(NSString* ref)

-        : wxCFRef< CFStringRef >((CFStringRef) ref) 
+        : wxCFRef< CFStringRef >((CFStringRef) ref)

     {
     }
 #endif
 
     wxCFStringRef(CFStringRef ref)
     {
     }
 #endif
 
     wxCFStringRef(CFStringRef ref)

-        : wxCFRef< CFStringRef >(ref) 
+        : wxCFRef< CFStringRef >(ref)

     {
     }
 
     wxCFStringRef(const wxCFStringRef& otherRef )
     {
     }
 
     wxCFStringRef(const wxCFStringRef& otherRef )

-        : wxCFRef< CFStringRef >(otherRef) 
+        : wxCFRef< CFStringRef >(otherRef)

     {
     }
 
     {
     }
 


@@ -69,7 +69,7 @@ public:
     }
 
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;
     }
 
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;

-    
+

     static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 #if wxOSX_USE_COCOA_OR_IPHONE
     static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
     static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
 #if wxOSX_USE_COCOA_OR_IPHONE
     static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

diff --git a/include/wx/osx/core/dataview.h b/include/wx/osx/core/dataview.h
index e5d4be4a79553ff0afc0139d8c8969fb6bf4780c..c8af8cd05c9f423fcdd61b045f74654a9c746579 100644 (file)
--- a/include/wx/osx/core/dataview.h
+++ b/include/wx/osx/core/dataview.h
@@ -22,7 +22,7 @@ typedef wxWidgetImpl wxWidgetImplType;
 // ---------------------------------------------------------
 // Helper functions for dataview implementation on OSX
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // Helper functions for dataview implementation on OSX
 // ---------------------------------------------------------

-wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* parent,  wxWindowID id, 
+wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* parent,  wxWindowID id,

                                  wxPoint const& pos, wxSize const& size,
                                  long style, long extraStyle);
 wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wxDataViewItem const& dataViewItem); // concatenates all data of the visible columns of the passed control
                                  wxPoint const& pos, wxSize const& size,
                                  long style, long extraStyle);
 wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wxDataViewItem const& dataViewItem); // concatenates all data of the visible columns of the passed control

diff --git a/include/wx/osx/core/mimetype.h b/include/wx/osx/core/mimetype.h
index 46058b070fade4a853c3598cee34577636f0a1b1..d3bc55f5ed288fcf86a92c76a1afa44e7d18aa26 100644 (file)
--- a/include/wx/osx/core/mimetype.h
+++ b/include/wx/osx/core/mimetype.h
@@ -79,7 +79,7 @@ protected:
 
     wxString GetCommand(const wxString &verb, size_t nIndex) const;
 
 
     wxString GetCommand(const wxString &verb, size_t nIndex) const;
 

-    // Read XDG *.desktop file 
+    // Read XDG *.desktop file

     void LoadXDGApp(const wxString& filename);
     // Scan XDG directory
     void LoadXDGAppsFilesFromDir(const wxString& dirname);
     void LoadXDGApp(const wxString& filename);
     // Scan XDG directory
     void LoadXDGAppsFilesFromDir(const wxString& dirname);

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 0c3a9fb3ec9c089747f5d23ff848c05b52c13f9c..b6df304840f44bf76e8f3292f1f47556b3866798 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -62,7 +62,7 @@ private:
 class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject
 {
 public :
 class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject
 {
 public :

-    wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) 
+    wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj)

     {
     }
     virtual ~wxDeferredObjectDeleter()
     {
     }
     virtual ~wxDeferredObjectDeleter()


@@ -104,20 +104,20 @@ typedef wxWidgetImpl wxWidgetImplType;
 #endif
 
 #if wxUSE_MENUS
 #endif
 
 #if wxUSE_MENUS

-class wxMenuItemImpl : public wxObject 
+class wxMenuItemImpl : public wxObject

 {
 public :
     wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer)
     {
     }
 {
 public :
     wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer)
     {
     }

-    
+

     virtual ~wxMenuItemImpl() ;
     virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void Enable( bool enable ) = 0;
     virtual void Check( bool check ) = 0;
     virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0;
     virtual void Hide( bool hide = true ) = 0;
     virtual ~wxMenuItemImpl() ;
     virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void Enable( bool enable ) = 0;
     virtual void Check( bool check ) = 0;
     virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0;
     virtual void Hide( bool hide = true ) = 0;

-    
+

     virtual void * GetHMenuItem() = 0;
 
     wxMenuItem* GetWXPeer() { return m_peer ; }
     virtual void * GetHMenuItem() = 0;
 
     wxMenuItem* GetWXPeer() { return m_peer ; }


@@ -132,27 +132,27 @@ public :
 
 protected :
     wxMenuItem* m_peer;
 
 protected :
     wxMenuItem* m_peer;

-    
+

     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 
     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 

-class wxMenuImpl : public wxObject 
+class wxMenuImpl : public wxObject

 {
 public :
     wxMenuImpl( wxMenu* peer ) : m_peer(peer)
     {
     }
 {
 public :
     wxMenuImpl( wxMenu* peer ) : m_peer(peer)
     {
     }

-    
-    virtual ~wxMenuImpl() ;    
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;    
+
+    virtual ~wxMenuImpl() ;
+    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;

     virtual void Remove( wxMenuItem *pItem ) = 0;
     virtual void Remove( wxMenuItem *pItem ) = 0;

-    
+

     virtual void MakeRoot() = 0;
 
     virtual void SetTitle( const wxString& text ) = 0;
 
     virtual WXHMENU GetHMenu() = 0;
     virtual void MakeRoot() = 0;
 
     virtual void SetTitle( const wxString& text ) = 0;
 
     virtual WXHMENU GetHMenu() = 0;

-    
+

     wxMenu* GetWXPeer() { return m_peer ; }
 
     virtual void PopUp( wxWindow *win, int x, int y ) = 0;
     wxMenu* GetWXPeer() { return m_peer ; }
 
     virtual void PopUp( wxWindow *win, int x, int y ) = 0;


@@ -161,7 +161,7 @@ public :
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     wxMenu* m_peer;
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     wxMenu* m_peer;

-    
+

     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 #endif
     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 #endif


@@ -179,7 +179,7 @@ public :
     bool                IsRootControl() const { return m_isRootControl; }
 
     wxWindowMac*        GetWXPeer() const { return m_wxPeer; }
     bool                IsRootControl() const { return m_isRootControl; }
 
     wxWindowMac*        GetWXPeer() const { return m_wxPeer; }

-    
+

     bool IsOk() const { return GetWXWidget() != NULL; }
 
     // not only the control itself, but also all its parents must be visible
     bool IsOk() const { return GetWXWidget() != NULL; }
 
     // not only the control itself, but also all its parents must be visible


@@ -189,13 +189,13 @@ public :
     virtual void        SetVisibility( bool visible ) = 0;
 
     virtual void        Raise() = 0;
     virtual void        SetVisibility( bool visible ) = 0;
 
     virtual void        Raise() = 0;

-    
+

     virtual void        Lower() = 0;
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy ) = 0;
 
     virtual WXWidget    GetWXWidget() const = 0;
     virtual void        Lower() = 0;
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy ) = 0;
 
     virtual WXWidget    GetWXWidget() const = 0;

-    
+

     virtual void        SetBackgroundColour( const wxColour& col ) = 0;
 
     // all coordinates in native parent widget relative coordinates
     virtual void        SetBackgroundColour( const wxColour& col ) = 0;
 
     // all coordinates in native parent widget relative coordinates


@@ -221,10 +221,10 @@ public :
     // return true if successful
     virtual bool        SetFocus() = 0;
     virtual bool        HasFocus() const = 0;
     // return true if successful
     virtual bool        SetFocus() = 0;
     virtual bool        HasFocus() const = 0;

-    
+

     virtual void        RemoveFromParent() = 0;
     virtual void        Embed( wxWidgetImpl *parent ) = 0;
     virtual void        RemoveFromParent() = 0;
     virtual void        Embed( wxWidgetImpl *parent ) = 0;

-    
+

     virtual void        SetDefaultButton( bool isDefault ) = 0;
     virtual void        PerformClick() = 0;
     virtual void        SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;
     virtual void        SetDefaultButton( bool isDefault ) = 0;
     virtual void        PerformClick() = 0;
     virtual void        SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;


@@ -254,202 +254,202 @@ public :
     // is the clicked event sent AFTER the state already changed, so no additional
     // state changing logic is required from the outside
     virtual bool        ButtonClickDidStateChange() = 0;
     // is the clicked event sent AFTER the state already changed, so no additional
     // state changing logic is required from the outside
     virtual bool        ButtonClickDidStateChange() = 0;

-    
+

     virtual void        InstallEventHandler( WXWidget control = NULL ) = 0;
 
     // static methods for associating native controls and their implementations
 
     virtual void        InstallEventHandler( WXWidget control = NULL ) = 0;
 
     // static methods for associating native controls and their implementations
 

-    static wxWidgetImpl* 
+    static wxWidgetImpl*

                         FindFromWXWidget(WXWidget control);
                         FindFromWXWidget(WXWidget control);

-    
+

     static void         RemoveAssociations( wxWidgetImpl* impl);
     static void         RemoveAssociations( wxWidgetImpl* impl);

-    
+

     static void         Associate( WXWidget control, wxWidgetImpl *impl );
     static void         Associate( WXWidget control, wxWidgetImpl *impl );

-    
+

     static WXWidget     FindFocus();
     static WXWidget     FindFocus();

-    
+

     // static creation methods, must be implemented by all toolkits
     // static creation methods, must be implemented by all toolkits

-    
-    static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+
+    static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
     static wxWidgetImplType*    CreateContentView( wxNonOwnedWindow* now ) ;
 
                                     long extraStyle) ;
     static wxWidgetImplType*    CreateContentView( wxNonOwnedWindow* now ) ;
 

-    static wxWidgetImplType*    CreateButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateDisclosureTriangle( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateDisclosureTriangle( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
                                     long extraStyle) ;

-                                    
-    static wxWidgetImplType*    CreateStaticLine( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+
+    static wxWidgetImplType*    CreateStaticLine( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateGroupBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateGroupBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateStaticText( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateStaticText( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateTextControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateTextControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& content,
                                     const wxString& content,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateSearchControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateSearchControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& content,
                                     const wxString& content,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateCheckBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateCheckBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
                                     long extraStyle);

-                                    
-    static wxWidgetImplType*    CreateRadioButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+
+    static wxWidgetImplType*    CreateRadioButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateBitmapToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateBitmapToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxBitmap& bitmap,
                                     const wxBitmap& bitmap,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateBitmapButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateBitmapButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxBitmap& bitmap,
                                     const wxBitmap& bitmap,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateTabView( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+    static wxWidgetImplType*    CreateTabView( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateGauge( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateGauge( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateSlider( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateSlider( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateSpinButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateSpinButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateScrollBar( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+    static wxWidgetImplType*    CreateScrollBar( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateChoice( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateChoice( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxMenu* menu,
                                     wxMenu* menu,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateListBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+    static wxWidgetImplType*    CreateListBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
     // converts from Toplevel-Content relative to local
                                     long extraStyle);
 
     // converts from Toplevel-Content relative to local


@@ -467,7 +467,7 @@ protected :
 // the interface to be implemented eg by a listbox
 //
 
 // the interface to be implemented eg by a listbox
 //
 

-class WXDLLIMPEXP_CORE wxListWidgetColumn 
+class WXDLLIMPEXP_CORE wxListWidgetColumn

 {
 public :
     virtual ~wxListWidgetColumn() {}
 {
 public :
     virtual ~wxListWidgetColumn() {}


@@ -478,12 +478,12 @@ class WXDLLIMPEXP_CORE wxListWidgetCellValue
 public :
     wxListWidgetCellValue() {}
     virtual ~wxListWidgetCellValue() {}
 public :
     wxListWidgetCellValue() {}
     virtual ~wxListWidgetCellValue() {}

-    
+

    virtual void Set( CFStringRef value ) = 0;
     virtual void Set( const wxString& value ) = 0;
     virtual void Set( int value ) = 0;
     virtual void Check( bool check );
    virtual void Set( CFStringRef value ) = 0;
     virtual void Set( const wxString& value ) = 0;
     virtual void Set( int value ) = 0;
     virtual void Check( bool check );

-    
+

     virtual bool IsChecked() const;
     virtual int GetIntValue() const = 0;
     virtual wxString GetStringValue() const = 0;
     virtual bool IsChecked() const;
     virtual int GetIntValue() const = 0;
     virtual wxString GetStringValue() const = 0;


@@ -494,12 +494,12 @@ class WXDLLIMPEXP_CORE wxListWidgetImpl
 public:
     wxListWidgetImpl() {}
     virtual ~wxListWidgetImpl() { }
 public:
     wxListWidgetImpl() {}
     virtual ~wxListWidgetImpl() { }

-    
-    virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false, 
+
+    virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,

                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;

-    virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false, 
+    virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,

                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1) = 0 ;
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1) = 0 ;

-    
+

     // add and remove
 
     // TODO will be replaced
     // add and remove
 
     // TODO will be replaced


@@ -514,7 +514,7 @@ public:
     virtual int             ListGetSelection() const = 0;
     virtual int             ListGetSelections( wxArrayInt& aSelections ) const = 0;
     virtual bool            ListIsSelected( unsigned int n ) const = 0;
     virtual int             ListGetSelection() const = 0;
     virtual int             ListGetSelections( wxArrayInt& aSelections ) const = 0;
     virtual bool            ListIsSelected( unsigned int n ) const = 0;

-    
+

     // display
 
     virtual void            ListScrollTo( unsigned int n ) = 0;
     // display
 
     virtual void            ListScrollTo( unsigned int n ) = 0;


@@ -618,21 +618,21 @@ public :
     virtual ~wxNonOwnedWindowImpl()
     {
     }
     virtual ~wxNonOwnedWindowImpl()
     {
     }

-            
-    virtual void Destroy() 
+
+    virtual void Destroy()

     {
     }
 
     virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) = 0;
     {
     }
 
     virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) = 0;

-    
-    
+
+

     virtual WXWindow GetWXWindow() const = 0;
     virtual WXWindow GetWXWindow() const = 0;

-        
+

     virtual void Raise()
     {
     }
     virtual void Raise()
     {
     }

-    
+

     virtual void Lower()
     {
     }
     virtual void Lower()
     {
     }


@@ -641,12 +641,12 @@ public :
     {
         return false;
     }
     {
         return false;
     }

-    
+

     virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
     {
         return Show(show);
     }
     virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
     {
         return Show(show);
     }

-        
+

     virtual void Update()
     {
     }
     virtual void Update()
     {
     }


@@ -664,18 +664,18 @@ public :
     virtual void SetExtraStyle( long WXUNUSED(exStyle) )
     {
     }
     virtual void SetExtraStyle( long WXUNUSED(exStyle) )
     {
     }

-    
+

     virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
     virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))

-    {            
+    {

         return false ;
     }
         return false ;
     }

-    
+

     bool CanSetTransparent()
     {
         return false;
     }
 
     bool CanSetTransparent()
     {
         return false;
     }
 

-    virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;    
+    virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;

     virtual void MoveWindow(int x, int y, int width, int height) = 0;
     virtual void GetPosition( int &x, int &y ) const = 0;
     virtual void GetSize( int &width, int &height ) const = 0;
     virtual void MoveWindow(int x, int y, int width, int height) = 0;
     virtual void GetPosition( int &x, int &y ) const = 0;
     virtual void GetSize( int &width, int &height ) const = 0;


@@ -684,31 +684,31 @@ public :
     {
         return false;
     }
     {
         return false;
     }

-        
+

     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0;
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0;

-    
+

     virtual bool IsMaximized() const = 0;
     virtual bool IsMaximized() const = 0;

-    
+

     virtual bool IsIconized() const= 0;
     virtual bool IsIconized() const= 0;

-    
+

     virtual void Iconize( bool iconize )= 0;
     virtual void Iconize( bool iconize )= 0;

-    
+

     virtual void Maximize(bool maximize) = 0;
     virtual void Maximize(bool maximize) = 0;

-    
+

     virtual bool IsFullScreen() const= 0;
     virtual bool IsFullScreen() const= 0;

-    
+

     virtual bool ShowFullScreen(bool show, long style)= 0;
 
     virtual void RequestUserAttention(int flags) = 0;
     virtual bool ShowFullScreen(bool show, long style)= 0;
 
     virtual void RequestUserAttention(int flags) = 0;

-    
-    virtual void ScreenToWindow( int *x, int *y ) = 0; 
-    
+
+    virtual void ScreenToWindow( int *x, int *y ) = 0;
+

     virtual void WindowToScreen( int *x, int *y ) = 0;
     virtual void WindowToScreen( int *x, int *y ) = 0;

-    
+

     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }

-    
+

     // static creation methods, must be implemented by all toolkits
     // static creation methods, must be implemented by all toolkits

-    
+

     static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name  ) ;
 
     static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name  ) ;
 

diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h
index 8caa5b4e6dad4748d331bc9295f7c455ca2ff6f5..9b5d2e2dcad33d35d06f918d679102629c2bcfd1 100644 (file)
--- a/include/wx/osx/dataobj2.h
+++ b/include/wx/osx/dataobj2.h
@@ -68,7 +68,7 @@ public:
     // ----------------------------------
 
     void AddFile( const wxString &filename );
     // ----------------------------------
 
     void AddFile( const wxString &filename );

-    
+

     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);

diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index ac851767330fa090bdd37487775384c61514f39c..679e229ba252afdfd57de179d373d6f830b52104 100644 (file)
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -32,7 +32,7 @@ public:
 // constructors / destructor
 //
   wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT);
 // constructors / destructor
 //
   wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT);

-  
+

   virtual ~wxDataViewRenderer(void);
 
 //
   virtual ~wxDataViewRenderer(void);
 
 //


@@ -400,7 +400,7 @@ public:
     {
       return this->m_NativeDataPtr;
     }
     {
       return this->m_NativeDataPtr;
     }

-    
+

     void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer
     void SetWidthVariable(int NewWidth)
     {
     void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer
     void SetWidthVariable(int NewWidth)
     {

diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 382d79b01c580d40f374951caa495b55e2f4bab5..52a501715ed24284fc7bd595d837af4e027a0bc6 100644 (file)
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -19,12 +19,12 @@ class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
 public:
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
 public:
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );

-    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); 
-    
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
+

     virtual ~wxMemoryDCImpl();
 
     virtual void DoGetSize( int *width, int *height ) const;
     virtual ~wxMemoryDCImpl();
 
     virtual void DoGetSize( int *width, int *height ) const;

-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const

        { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
     virtual void DoSelect(const wxBitmap& bitmap);
 
        { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
     virtual void DoSelect(const wxBitmap& bitmap);
 


@@ -32,12 +32,12 @@ public:
         { return m_selected; }
     virtual wxBitmap& GetSelectedBitmap()
         { return m_selected; }
         { return m_selected; }
     virtual wxBitmap& GetSelectedBitmap()
         { return m_selected; }

-    
+

 private:
     void Init();
 
     wxBitmap  m_selected;
 private:
     void Init();
 
     wxBitmap  m_selected;

-    
+

     DECLARE_CLASS(wxMemoryDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
     DECLARE_CLASS(wxMemoryDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };

diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index f23c4a6f76d60fa1e07b36fb303dd7f5d7d714c2..50e8221d86735bf8454948e7f247f21da2652b86 100644 (file)
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -24,7 +24,7 @@ public:
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
 private:
     void* m_overlayWindow;
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
 private:
     void* m_overlayWindow;

-        
+

 private:
     DECLARE_CLASS(wxScreenDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 private:
     DECLARE_CLASS(wxScreenDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);

diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index b956c42e325a9de54b202f305c21b4c50b8b9986..f4762f2b03591c5f11a1e7bf991fa63af70e5676 100644 (file)
--- a/include/wx/osx/dnd.h
+++ b/include/wx/osx/dnd.h
@@ -55,7 +55,7 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
     virtual bool OnDrop(wxCoord x, wxCoord y);
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();
     virtual bool OnDrop(wxCoord x, wxCoord y);
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();

-    // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement. 
+    // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement.

     virtual wxDataFormat GetMatchingPair();
 
     bool CurrentDragHasSupportedFormat() ;
     virtual wxDataFormat GetMatchingPair();
 
     bool CurrentDragHasSupportedFormat() ;

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 79fb78b7c49402a18e279e66f612d7b09fd501ba..6f379089c0d9dbca08ab288a85d3554ee997f93d 100644 (file)
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -60,7 +60,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -72,7 +72,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,


@@ -91,7 +91,7 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool CreateSystemFont(wxOSXSystemFont font);
     bool Create(const wxNativeFontInfo& info);
 
     bool CreateSystemFont(wxOSXSystemFont font);

-    
+

     virtual ~wxFont();
 
     // implement base class pure virtuals
     virtual ~wxFont();
 
     // implement base class pure virtuals

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index be5e40f6eee60c885640b3dc0fccf41640dd9ace..666fb3bf52749cd2d0fa86d04c928f2e51bea54f 100644 (file)
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenuBar;
 class WXDLLIMPEXP_FWD_CORE wxStatusBar;
 class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 
 class WXDLLIMPEXP_FWD_CORE wxStatusBar;
 class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 

-class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase 
+class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase

 {
 public:
     // construction
 {
 public:
     // construction

diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index 8dfde849eb3af783bf1f4642fc45d25996c5216e..62b5c001beebbcb8cdd8ffbe960eba71642503f6 100644 (file)
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -40,7 +40,7 @@ public:
 
     // Mac-specific
     WXGLContext GetWXGLContext() const { return m_glContext; }
 
     // Mac-specific
     WXGLContext GetWXGLContext() const { return m_glContext; }

-    
+

 private:
     WXGLContext m_glContext;
 
 private:
     WXGLContext m_glContext;
 


@@ -139,7 +139,7 @@ public:
     virtual void MacVisibilityChanged();
 
     void MacUpdateView();
     virtual void MacVisibilityChanged();
 
     void MacUpdateView();

-    
+

     GLint GetAglBufferName() const { return m_bufferName; }
 #endif
 
     GLint GetAglBufferName() const { return m_bufferName; }
 #endif
 

diff --git a/include/wx/osx/imaglist.h b/include/wx/osx/imaglist.h
index 10e96b588dca42b4051ecf25ab8c92eda6d72550..b56242db1246f5c4ad940faf4d37460823a7dcb2 100644 (file)
--- a/include/wx/osx/imaglist.h
+++ b/include/wx/osx/imaglist.h
@@ -27,10 +27,10 @@ public:
     virtual ~wxImageList();
     bool Create( int width, int height, bool mask = true, int initialCount = 1 );
     bool Create();
     virtual ~wxImageList();
     bool Create( int width, int height, bool mask = true, int initialCount = 1 );
     bool Create();

-    
+

     virtual int GetImageCount() const;
     virtual bool GetSize( int index, int &width, int &height ) const;
     virtual int GetImageCount() const;
     virtual bool GetSize( int index, int &width, int &height ) const;

-    
+

     int Add( const wxIcon& bitmap );
     int Add( const wxBitmap& bitmap );
     int Add( const wxBitmap& bitmap, const wxBitmap& mask );
     int Add( const wxIcon& bitmap );
     int Add( const wxBitmap& bitmap );
     int Add( const wxBitmap& bitmap, const wxBitmap& mask );


@@ -42,17 +42,17 @@ public:
     bool Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask );
     bool Remove( int index );
     bool RemoveAll();
     bool Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask );
     bool Remove( int index );
     bool RemoveAll();

-    
+

     virtual bool Draw(int index, wxDC& dc, int x, int y,
                       int flags = wxIMAGELIST_DRAW_NORMAL,
                       bool solidBackground = false);
     virtual bool Draw(int index, wxDC& dc, int x, int y,
                       int flags = wxIMAGELIST_DRAW_NORMAL,
                       bool solidBackground = false);

-    
+

 private:
     wxList  m_images;
 private:
     wxList  m_images;

-    
+

     int     m_width;
     int     m_height;
     int     m_width;
     int     m_height;

-    
+

     DECLARE_DYNAMIC_CLASS(wxImageList)
 };
 
     DECLARE_DYNAMIC_CLASS(wxImageList)
 };
 

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index aa9d375edb5e94037d77e796251fbb428f215ec8..91892e86bcb8fa81d8cbef3d81199cd4db6c37b6 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -22,7 +22,7 @@
 
 #define wxOSX_USE_CORE_TEXT 0
 #define wxOSX_USE_ATSU_TEXT 0
 
 #define wxOSX_USE_CORE_TEXT 0
 #define wxOSX_USE_ATSU_TEXT 0

-#define wxHAS_OPENGL_ES 
+#define wxHAS_OPENGL_ES

 
 /*
  * turning off capabilities that don't work under iphone yet
 
 /*
  * turning off capabilities that don't work under iphone yet


@@ -85,21 +85,21 @@
 #define wxUSE_COMBOBOX 0
 #endif
 
 #define wxUSE_COMBOBOX 0
 #endif
 

-#undef wxUSE_SCROLLBAR 
+#undef wxUSE_SCROLLBAR

 #define wxUSE_SCROLLBAR 0
 
 #define wxUSE_SCROLLBAR 0
 

-#undef wxUSE_STATUSBAR 
-#undef wxUSE_NATIVE_STATUSBAR 
-#undef wxUSE_TEXTCTRL 
-#undef wxUSE_ABOUTDLG 
-#undef wxUSE_STATTEXT 
-#undef wxUSE_STATLINE 
-#undef wxUSE_COLLPANE 
-#undef wxUSE_STATBMP 
-#undef wxUSE_STATBOX 
+#undef wxUSE_STATUSBAR
+#undef wxUSE_NATIVE_STATUSBAR
+#undef wxUSE_TEXTCTRL
+#undef wxUSE_ABOUTDLG
+#undef wxUSE_STATTEXT
+#undef wxUSE_STATLINE
+#undef wxUSE_COLLPANE
+#undef wxUSE_STATBMP
+#undef wxUSE_STATBOX

 #undef wxUSE_CHECKBOX
 #undef wxUSE_CHECKBOX

-#undef wxUSE_RADIOBTN 
-#undef wxUSE_RADIOBOX 
+#undef wxUSE_RADIOBTN
+#undef wxUSE_RADIOBOX

 #undef wxUSE_TOGGLEBTN
 
 
 #undef wxUSE_TOGGLEBTN
 
 


@@ -117,45 +117,45 @@
 #define wxUSE_RADIOBOX 0
 #define wxUSE_TOGGLEBTN 0
 
 #define wxUSE_RADIOBOX 0
 #define wxUSE_TOGGLEBTN 0
 

-#undef wxUSE_TOOLBAR 
-#undef wxUSE_HTML 
+#undef wxUSE_TOOLBAR
+#undef wxUSE_HTML

 
 #define wxUSE_TOOLBAR 0
 #define wxUSE_HTML 0
 
 
 #define wxUSE_TOOLBAR 0
 #define wxUSE_HTML 0
 

-#undef wxUSE_RICHTEXT 
+#undef wxUSE_RICHTEXT

 #define wxUSE_RICHTEXT 0
 
 #define wxUSE_RICHTEXT 0
 

-#undef wxUSE_ANIMATIONCTRL 
-#undef wxUSE_CALENDARCTRL 
-#undef wxUSE_COMBOCTRL 
-#undef wxUSE_ODCOMBOBOX 
-#undef wxUSE_BITMAPCOMBOBOX 
-#undef wxUSE_BMPBUTTON 
-#undef wxUSE_CHECKLISTBOX 
-#undef wxUSE_GAUGE 
-#undef wxUSE_GRID 
-#undef wxUSE_LISTBOX 
-#undef wxUSE_LISTCTRL 
-#undef wxUSE_NOTEBOOK 
-#undef wxUSE_SLIDER 
-#undef wxUSE_SPINBTN 
-#undef wxUSE_SPINCTRL 
-#undef wxUSE_TREECTRL 
-#undef wxUSE_DATEPICKCTRL 
-#undef wxUSE_DATAVIEWCTRL 
-#undef wxUSE_EDITABLELISTBOX 
-#undef wxUSE_FILEPICKERCTRL 
-#undef wxUSE_DIRPICKERCTRL 
-#undef wxUSE_FILECTRL 
-#undef wxUSE_COLOURPICKERCTRL 
-#undef wxUSE_FONTPICKERCTRL 
-#undef wxUSE_DEBUGREPORT 
-#undef wxUSE_HYPERLINKCTRL 
-#undef wxUSE_STC 
+#undef wxUSE_ANIMATIONCTRL
+#undef wxUSE_CALENDARCTRL
+#undef wxUSE_COMBOCTRL
+#undef wxUSE_ODCOMBOBOX
+#undef wxUSE_BITMAPCOMBOBOX
+#undef wxUSE_BMPBUTTON
+#undef wxUSE_CHECKLISTBOX
+#undef wxUSE_GAUGE
+#undef wxUSE_GRID
+#undef wxUSE_LISTBOX
+#undef wxUSE_LISTCTRL
+#undef wxUSE_NOTEBOOK
+#undef wxUSE_SLIDER
+#undef wxUSE_SPINBTN
+#undef wxUSE_SPINCTRL
+#undef wxUSE_TREECTRL
+#undef wxUSE_DATEPICKCTRL
+#undef wxUSE_DATAVIEWCTRL
+#undef wxUSE_EDITABLELISTBOX
+#undef wxUSE_FILEPICKERCTRL
+#undef wxUSE_DIRPICKERCTRL
+#undef wxUSE_FILECTRL
+#undef wxUSE_COLOURPICKERCTRL
+#undef wxUSE_FONTPICKERCTRL
+#undef wxUSE_DEBUGREPORT
+#undef wxUSE_HYPERLINKCTRL
+#undef wxUSE_STC

 #undef wxUSE_AUI
 #undef wxUSE_AUI

-#undef wxUSE_BUSYINFO 
-#undef wxUSE_SEARCHCTRL 
+#undef wxUSE_BUSYINFO
+#undef wxUSE_SEARCHCTRL

 
 #define wxUSE_ANIMATIONCTRL 0
 #define wxUSE_CALENDARCTRL 0
 
 #define wxUSE_ANIMATIONCTRL 0
 #define wxUSE_CALENDARCTRL 0


@@ -188,27 +188,27 @@
 #define wxUSE_BUSYINFO 0
 #define wxUSE_SEARCHCTRL 0
 
 #define wxUSE_BUSYINFO 0
 #define wxUSE_SEARCHCTRL 0
 

-#undef wxUSE_LOGWINDOW 
-#undef wxUSE_LOG_DIALOG 
-#undef wxUSE_LISTBOOK 
-#undef wxUSE_CHOICEBOOK 
-#undef wxUSE_TREEBOOK 
-#undef wxUSE_TOOLBOOK 
-#undef wxUSE_CHOICEDLG 
-#undef wxUSE_HELP 
-#undef wxUSE_PROGRESSDLG 
-#undef  wxUSE_FONTDLG 
-#undef wxUSE_FILEDLG 
-#undef wxUSE_CHOICEDLG 
-#undef wxUSE_NUMBERDLG 
-#undef wxUSE_TEXTDLG 
-#undef wxUSE_DIRDLG 
-#undef wxUSE_STARTUP_TIPS 
-#undef wxUSE_WIZARDDLG 
-#undef wxUSE_TOOLBAR_NATIVE 
-#undef wxUSE_FINDREPLDLG 
-#undef wxUSE_TASKBARICON 
-#undef wxUSE_REARRANGECTRL 
+#undef wxUSE_LOGWINDOW
+#undef wxUSE_LOG_DIALOG
+#undef wxUSE_LISTBOOK
+#undef wxUSE_CHOICEBOOK
+#undef wxUSE_TREEBOOK
+#undef wxUSE_TOOLBOOK
+#undef wxUSE_CHOICEDLG
+#undef wxUSE_HELP
+#undef wxUSE_PROGRESSDLG
+#undef  wxUSE_FONTDLG
+#undef wxUSE_FILEDLG
+#undef wxUSE_CHOICEDLG
+#undef wxUSE_NUMBERDLG
+#undef wxUSE_TEXTDLG
+#undef wxUSE_DIRDLG
+#undef wxUSE_STARTUP_TIPS
+#undef wxUSE_WIZARDDLG
+#undef wxUSE_TOOLBAR_NATIVE
+#undef wxUSE_FINDREPLDLG
+#undef wxUSE_TASKBARICON
+#undef wxUSE_REARRANGECTRL

 
 #define wxUSE_LOGWINDOW 0
 #define wxUSE_LOG_DIALOG 0
 
 #define wxUSE_LOGWINDOW 0
 #define wxUSE_LOG_DIALOG 0

diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h
index 252b26c10e1ea611c8184b170badc7d143903b03..b4c25709a512b952bf29c6d83683cb8f744975cc 100644 (file)
--- a/include/wx/osx/iphone/private.h
+++ b/include/wx/osx/iphone/private.h
@@ -32,17 +32,17 @@ WX_UIImage WXDLLIMPEXP_CORE wxOSXCreateUIImageFromCGImage( CGImageRef image );
 class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
 {
 public :
 class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
 {
 public :

-    wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;    
-    wxWidgetIPhoneImpl() ;    
-    ~wxWidgetIPhoneImpl();    
-    
+    wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+    wxWidgetIPhoneImpl() ;
+    ~wxWidgetIPhoneImpl();
+

     void Init();
     void Init();

-    
+

     virtual bool        IsVisible() const ;
     virtual void        SetVisibility( bool visible );
     virtual bool        IsVisible() const ;
     virtual void        SetVisibility( bool visible );

-    
+

     virtual void        Raise();
     virtual void        Raise();

-    
+

     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );


@@ -67,7 +67,7 @@ public :
 
     void                RemoveFromParent();
     void                Embed( wxWidgetImpl *parent );
 
     void                RemoveFromParent();
     void                Embed( wxWidgetImpl *parent );

-    
+

     void                SetDefaultButton( bool isDefault );
     void                PerformClick();
     virtual void        SetLabel(const wxString& title, wxFontEncoding encoding);
     void                SetDefaultButton( bool isDefault );
     void                PerformClick();
     virtual void        SetLabel(const wxString& title, wxFontEncoding encoding);


@@ -82,7 +82,7 @@ public :
     virtual wxBitmap    GetBitmap() const;
     virtual void        SetBitmap( const wxBitmap& bitmap );
     virtual void        SetBitmapPosition( wxDirection dir );
     virtual wxBitmap    GetBitmap() const;
     virtual void        SetBitmap( const wxBitmap& bitmap );
     virtual void        SetBitmapPosition( wxDirection dir );

-       
+

     void                SetupTabs( const wxNotebook &notebook );
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;
     void                SetupTabs( const wxNotebook &notebook );
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;


@@ -98,18 +98,18 @@ public :
     void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
 
     void                InstallEventHandler( WXWidget control = NULL );
     void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
 
     void                InstallEventHandler( WXWidget control = NULL );

-    
-    virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow); 
+
+    virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);

 
     // thunk connected calls
 
     // thunk connected calls

- 
+

     virtual void        drawRect(CGRect* rect, WXWidget slf, void* _cmd);
     virtual void        touchEvent(WX_NSSet touches, WX_UIEvent event, WXWidget slf, void* _cmd);
     virtual bool        becomeFirstResponder(WXWidget slf, void* _cmd);
     virtual bool        resignFirstResponder(WXWidget slf, void* _cmd);
 
     // action
     virtual void        drawRect(CGRect* rect, WXWidget slf, void* _cmd);
     virtual void        touchEvent(WX_NSSet touches, WX_UIEvent event, WXWidget slf, void* _cmd);
     virtual bool        becomeFirstResponder(WXWidget slf, void* _cmd);
     virtual bool        resignFirstResponder(WXWidget slf, void* _cmd);
 
     // action

-    
+

     virtual void        touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd);
 
 protected:
     virtual void        touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd);
 
 protected:


@@ -122,59 +122,59 @@ class wxNonOwnedWindowIPhoneImpl : public wxNonOwnedWindowImpl
 public :
     wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowIPhoneImpl();
 public :
     wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowIPhoneImpl();

-    
+

     virtual ~wxNonOwnedWindowIPhoneImpl();
     virtual ~wxNonOwnedWindowIPhoneImpl();

-    
+

     virtual void Destroy() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;
     virtual void Destroy() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;

-    
+

     WXWindow GetWXWindow() const;
     WXWindow GetWXWindow() const;

-    void Raise();    
+    void Raise();

     void Lower();
     void Lower();

-    bool Show(bool show);    
+    bool Show(bool show);

     bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
     bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);

-        
+

     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );

-    void SetExtraStyle( long exStyle );    
-    bool SetBackgroundStyle(wxBackgroundStyle style);    
+    void SetExtraStyle( long exStyle );
+    bool SetBackgroundStyle(wxBackgroundStyle style);

     bool CanSetTransparent();
 
     void MoveWindow(int x, int y, int width, int height);
     void GetPosition( int &x, int &y ) const;
     void GetSize( int &width, int &height ) const;
 
     bool CanSetTransparent();
 
     void MoveWindow(int x, int y, int width, int height);
     void GetPosition( int &x, int &y ) const;
     void GetSize( int &width, int &height ) const;
 

-    void GetContentArea( int &left , int &top , int &width , int &height ) const;    
+    void GetContentArea( int &left , int &top , int &width , int &height ) const;

     bool SetShape(const wxRegion& region);
     bool SetShape(const wxRegion& region);

-    
+

     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;

-    
+

     virtual bool IsMaximized() const;
     virtual bool IsMaximized() const;

-    
+

     virtual bool IsIconized() const;
     virtual bool IsIconized() const;

-    
+

     virtual void Iconize( bool iconize );
     virtual void Iconize( bool iconize );

-    
+

     virtual void Maximize(bool maximize);
     virtual void Maximize(bool maximize);

-    
+

     virtual bool IsFullScreen() const;
     virtual bool IsFullScreen() const;

-    
+

     virtual bool ShowFullScreen(bool show, long style);
 
     virtual void RequestUserAttention(int flags);
     virtual bool ShowFullScreen(bool show, long style);
 
     virtual void RequestUserAttention(int flags);

-    
+

     virtual void ScreenToWindow( int *x, int *y );
     virtual void ScreenToWindow( int *x, int *y );

-    
+

     virtual void WindowToScreen( int *x, int *y );
     virtual void WindowToScreen( int *x, int *y );

-    
+

     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     WX_UIWindow          m_macWindow;
     void *              m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl)
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     WX_UIWindow          m_macWindow;
     void *              m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl)

-};    
+};

 
 #ifdef __OBJC__
 
 
 #ifdef __OBJC__
 


@@ -182,14 +182,14 @@ protected :
     WXDLLIMPEXP_CORE wxRect wxFromNSRect( UIView* parent, const CGRect& rect );
     WXDLLIMPEXP_CORE CGPoint wxToNSPoint( UIView* parent, const wxPoint& p );
     WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p );
     WXDLLIMPEXP_CORE wxRect wxFromNSRect( UIView* parent, const CGRect& rect );
     WXDLLIMPEXP_CORE CGPoint wxToNSPoint( UIView* parent, const wxPoint& p );
     WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p );

-    
-    CGRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , 
+
+    CGRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,

         bool adjustForOrigin = true );
 
     @interface wxUIButton : UIButton
     {
     }
         bool adjustForOrigin = true );
 
     @interface wxUIButton : UIButton
     {
     }

-    
+

     @end
 
     void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
     @end
 
     void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);

diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index bf01a78fecd5de48c6ec094cd02b9f3d277dda27..bb0e176251621e8522f12b01f6dda3991dc585ab 100644 (file)
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -90,7 +90,7 @@ public:
         const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();
         const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();

-    
+

     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
 
     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
 


@@ -102,7 +102,7 @@ public:
     // data callbacks
     virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
     virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
     // data callbacks
     virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
     virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );

-    
+

     virtual bool IsSelected(int n) const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
     virtual bool IsSelected(int n) const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;


@@ -119,7 +119,7 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     wxListWidgetImpl* GetListPeer() const;
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     wxListWidgetImpl* GetListPeer() const;

-    
+

     bool MacGetBlockEvents() const { return m_blockEvents; }
 
     virtual void HandleLineEvent( unsigned int n, bool doubleClick );
     bool MacGetBlockEvents() const { return m_blockEvents; }
 
     virtual void HandleLineEvent( unsigned int n, bool doubleClick );


@@ -151,11 +151,11 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
     bool m_blockEvents;
     virtual wxSize DoGetBestSize() const;
 
     bool m_blockEvents;

-    
+

     wxListWidgetColumn* m_textColumn;
     wxListWidgetColumn* m_textColumn;

-    
+

     // data storage (copied from univ)
     // data storage (copied from univ)

-    
+

     // the array containing all items (it is sorted if the listbox has
     // wxLB_SORT style)
     union
     // the array containing all items (it is sorted if the listbox has
     // wxLB_SORT style)
     union


@@ -166,7 +166,7 @@ protected:
 
     // and this one the client data (either void or wxClientData)
     wxArrayPtrVoid m_itemsClientData;
 
     // and this one the client data (either void or wxClientData)
     wxArrayPtrVoid m_itemsClientData;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()

diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index bac68f21b5e4d726f13fb8f1ae05b884e32e3655..7ddd11217069eae51cdd61a413c6d68a089b099b 100644 (file)
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -58,20 +58,20 @@ public:
     void HandleMenuClosed();
 
     wxMenuImpl* GetPeer() { return m_peer; }
     void HandleMenuClosed();
 
     wxMenuImpl* GetPeer() { return m_peer; }

-    
+

     // make sure we can veto
     void SetAllowRearrange( bool allow );
     bool AllowRearrange() const { return m_allowRearrange; }
     // make sure we can veto
     void SetAllowRearrange( bool allow );
     bool AllowRearrange() const { return m_allowRearrange; }

-    
+

     // if a menu is used purely for internal implementation reasons (eg wxChoice)
     // we don't want native menu events being triggered
     void SetNoEventsMode( bool noEvents );
     bool GetNoEventsMode() const { return m_noEventsMode; }
 protected:
     // hide special menu items like exit, preferences etc
     // if a menu is used purely for internal implementation reasons (eg wxChoice)
     // we don't want native menu events being triggered
     void SetNoEventsMode( bool noEvents );
     bool GetNoEventsMode() const { return m_noEventsMode; }
 protected:
     // hide special menu items like exit, preferences etc

-    // that are expected in the app menu  
+    // that are expected in the app menu

     void DoRearrange() ;
     void DoRearrange() ;

-    
+

     bool DoHandleMenuEvent( wxEvent& evt );
     virtual wxMenuItem* DoAppend(wxMenuItem *item);
     virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
     bool DoHandleMenuEvent( wxEvent& evt );
     virtual wxMenuItem* DoAppend(wxMenuItem *item);
     virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);


@@ -92,13 +92,13 @@ private:
 
     // in this menu rearranging of menu items (esp hiding) is allowed
     bool m_allowRearrange;
 
     // in this menu rearranging of menu items (esp hiding) is allowed
     bool m_allowRearrange;

-    
+

     // don't trigger native events
     bool m_noEventsMode;
     // don't trigger native events
     bool m_noEventsMode;

-    
+

     // the position of the first item in the current radio group or -1
     int m_startRadioGroup;
     // the position of the first item in the current radio group or -1
     int m_startRadioGroup;

-    
+

     wxMenuImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
     wxMenuImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)


@@ -187,7 +187,7 @@ protected:
 private:
     static wxMenuBar*            s_macInstalledMenuBar ;
     static wxMenuBar*            s_macCommonMenuBar ;
 private:
     static wxMenuBar*            s_macInstalledMenuBar ;
     static wxMenuBar*            s_macCommonMenuBar ;

-  
+

     wxMenu* m_rootMenu;
     wxMenu* m_appleMenu;
 
     wxMenu* m_rootMenu;
     wxMenu* m_appleMenu;
 

diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h
index 8e9e82da3182cbd11e36cecca090bf6d1b17029a..3e7c246bf711321b39c29599306228cf1872d54b 100644 (file)
--- a/include/wx/osx/menuitem.h
+++ b/include/wx/osx/menuitem.h
@@ -75,7 +75,7 @@ private:
 
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
     void* m_menu ; // the appropriate menu , may also be a system menu
 
     wxBitmap  m_bitmap; // Bitmap for menuitem, if any
     void* m_menu ; // the appropriate menu , may also be a system menu

-    
+

     wxMenuItemImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
     wxMenuItemImpl* m_peer;
 
     DECLARE_DYNAMIC_CLASS(wxMenuItem)

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 77f328f2afcd4c3f2dbcee472d69295ce99c3a6a..6df0dbe286c7bc81a0633605c4e4a366eb495bdb 100644 (file)
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -2,7 +2,7 @@
 // Name:        wx/mac/nonownedwnd.h
 // Purpose:     declares wxNonOwnedWindow class
 // Author:      Stefan Csomor
 // Name:        wx/mac/nonownedwnd.h
 // Purpose:     declares wxNonOwnedWindow class
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     2008-03-24
 // RCS-ID:      $Id: nonownedwnd.h 46993 2007-06-28 08:46:04Z VS $
 // Copyright:   (c) 2008 Stefan Csomor
 // Created:     2008-03-24
 // RCS-ID:      $Id: nonownedwnd.h 46993 2007-06-28 08:46:04Z VS $
 // Copyright:   (c) 2008 Stefan Csomor


@@ -65,7 +65,7 @@ public:
     virtual bool CanSetTransparent();
 
     virtual bool SetBackgroundStyle(wxBackgroundStyle style);
     virtual bool CanSetTransparent();
 
     virtual bool SetBackgroundStyle(wxBackgroundStyle style);

-    
+

     virtual void Update();
 
     WXWindow GetWXWindow() const ;
     virtual void Update();
 
     WXWindow GetWXWindow() const ;


@@ -94,16 +94,16 @@ public:
     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );

-    
+

     wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
     wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }

-    
+

     // osx specific event handling common for all osx-ports
     // osx specific event handling common for all osx-ports

-    
+

     virtual void HandleActivated( double timestampsec, bool didActivate );
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );
     virtual void HandleActivated( double timestampsec, bool didActivate );
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );

-        
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();

diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h
index ff60922e2a6966ae72cf854a8a99631f962a590d..3be36587add0bd504bffe96c82d37f973609f0b0 100644 (file)
--- a/include/wx/osx/notebook.h
+++ b/include/wx/osx/notebook.h
@@ -82,7 +82,7 @@ public:
 
   // hit test
   virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
 
   // hit test
   virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;

-  
+

   // calculate size for wxNotebookSizer
   wxSize CalcSizeFromPage(const wxSize& sizePage) const;
   wxRect GetPageRect() const ;
   // calculate size for wxNotebookSizer
   wxSize CalcSizeFromPage(const wxSize& sizePage) const;
   wxRect GetPageRect() const ;


@@ -118,7 +118,7 @@ public:
   // -------------------
   virtual void Command(wxCommandEvent& event);
     // osx specific event handling common for all osx-ports
   // -------------------
   virtual void Command(wxCommandEvent& event);
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:
     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:

diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h
index de27a024d90426dd57cb206e0fed2fa9f26d2e45..a91fd69c85e43eeb0df354d03083938b1f8a0c20 100644 (file)
--- a/include/wx/osx/pnghand.h
+++ b/include/wx/osx/pnghand.h
@@ -2,7 +2,7 @@
 // Name:        pnghand.h
 // Purpose:     PNG bitmap handler
 // Author:      Julian Smart
 // Name:        pnghand.h
 // Purpose:     PNG bitmap handler
 // Author:      Julian Smart

-// Modified by: 
+// Modified by:

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h
index 3bf458ef156f78451a793614d1cbc5bc8f8b5973..4ecdc4ffbb00089f96db8aaf0521a5e63203913a 100644 (file)
--- a/include/wx/osx/popupwin.h
+++ b/include/wx/osx/popupwin.h
@@ -3,7 +3,7 @@
 // Purpose:     wxPopupWindow class for wxMac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxPopupWindow class for wxMac
 // Author:      Stefan Csomor
 // Modified by:

-// Created:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence

diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h
index d6ec1ce09bfa9abd3f24559c9bcc8345c9622a85..dc1cf5c72aadc581466100b6b4877e1e4894c3ca 100644 (file)
--- a/include/wx/osx/printdlg.h
+++ b/include/wx/osx/printdlg.h
@@ -18,7 +18,7 @@
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"
 #include "wx/prntbase.h"
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"
 #include "wx/prntbase.h"

-    
+

 /*
  * wxMacPrintDialog
  * The Mac dialog for printing
 /*
  * wxMacPrintDialog
  * The Mac dialog for printing


@@ -45,7 +45,7 @@ private:
     wxDC*               m_printerDC;
     bool                m_destroyDC;
     wxWindow*           m_dialogParent;
     wxDC*               m_printerDC;
     bool                m_destroyDC;
     wxWindow*           m_dialogParent;

-  
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 };


@@ -62,14 +62,14 @@ public:
     virtual ~wxMacPageSetupDialog();
 
     virtual wxPageSetupData& GetPageSetupDialogData();
     virtual ~wxMacPageSetupDialog();
 
     virtual wxPageSetupData& GetPageSetupDialogData();

-    
+

     bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
     virtual int ShowModal();
     bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
     virtual int ShowModal();

-  
+

 private:
     wxPageSetupData   m_pageSetupData;
     wxWindow*               m_dialogParent;
 private:
     wxPageSetupData   m_pageSetupData;
     wxWindow*               m_dialogParent;

-  
+

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
 };


@@ -93,17 +93,17 @@ public:
 
 private:
     wxPageSetupData* m_pageSetupDialogData;
 
 private:
     wxPageSetupData* m_pageSetupDialogData;

-    
+

     wxPoint m_MinMarginTopLeft;
     wxPoint m_MinMarginBottomRight;
     wxTextCtrl *m_LeftMargin;
     wxTextCtrl *m_TopMargin;
     wxTextCtrl *m_RightMargin;
     wxTextCtrl *m_BottomMargin;
     wxPoint m_MinMarginTopLeft;
     wxPoint m_MinMarginBottomRight;
     wxTextCtrl *m_LeftMargin;
     wxTextCtrl *m_TopMargin;
     wxTextCtrl *m_RightMargin;
     wxTextCtrl *m_BottomMargin;

-    
+

     void GetMinMargins();
     bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);
     void GetMinMargins();
     bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);

-    
+

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
 };

diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h
index 776d6643c19a499ddb054b2509856ef0fd15beb7..5d39109a0d2d26e47eaed8fe9f98d0383e23698f 100644 (file)
--- a/include/wx/osx/printmac.h
+++ b/include/wx/osx/printmac.h
@@ -17,7 +17,7 @@
 /*
  * Represents the printer: manages printing a wxPrintout object
  */
 /*
  * Represents the printer: manages printing a wxPrintout object
  */

- 
+

 class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
 {
   DECLARE_DYNAMIC_CLASS(wxMacPrinter)
 class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
 {
   DECLARE_DYNAMIC_CLASS(wxMacPrinter)


@@ -38,7 +38,7 @@ class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
  * wxPrintPreview
  * Programmer creates an object of this class to preview a wxPrintout.
  */
  * wxPrintPreview
  * Programmer creates an object of this class to preview a wxPrintout.
  */

- 
+

 class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase
 {
   DECLARE_CLASS(wxMacPrintPreview)
 class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase
 {
   DECLARE_CLASS(wxMacPrintPreview)

diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h
index 6cf506ec36becc6c6c92659165f4eb109e776d1c..54e4fa34d6d1ad07f5aa5afb001f2d687a9c6a8a 100644 (file)
--- a/include/wx/osx/radiobut.h
+++ b/include/wx/osx/radiobut.h
@@ -39,18 +39,18 @@ public:
     virtual void SetValue(bool val);
     virtual bool GetValue() const ;
 
     virtual void SetValue(bool val);
     virtual bool GetValue() const ;
 

-    // implementation 
-    
+    // implementation
+

     void Command(wxCommandEvent& event);
     wxRadioButton *AddInCycle(wxRadioButton *cycle);
     void RemoveFromCycle();
     inline wxRadioButton *NextInCycle() {return m_cycle;}
     void Command(wxCommandEvent& event);
     wxRadioButton *AddInCycle(wxRadioButton *cycle);
     void RemoveFromCycle();
     inline wxRadioButton *NextInCycle() {return m_cycle;}

-    
+

     // osx specific event handling common for all osx-ports
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool        OSXHandleClicked( double timestampsec );
   protected:
     virtual bool        OSXHandleClicked( double timestampsec );
   protected:

-  
+

     wxRadioButton *m_cycle;
 };
 
     wxRadioButton *m_cycle;
 };
 

diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index b70ae451b0def4329a28c433d20cd4708b4def2a..535d61c22ed37b8f5ad90d7a6e5c4a85d2367596 100644 (file)
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -76,7 +76,7 @@ public:
 
     void Command(wxCommandEvent& event);
     // osx specific event handling common for all osx-ports
 
     void Command(wxCommandEvent& event);
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool OSXHandleClicked( double timestampsec );
     virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
 
     virtual bool OSXHandleClicked( double timestampsec );
     virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
 

diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h
index 670b170b9e0f74bce4bdabd9a63749720e351b9f..d581290fc4c0e21af549c13e93d85cf894debb3f 100644 (file)
--- a/include/wx/osx/sound.h
+++ b/include/wx/osx/sound.h
@@ -32,7 +32,7 @@ public:
   static bool IsPlaying();
 
   void* GetHandle();
   static bool IsPlaying();
 
   void* GetHandle();

-protected:  
+protected:

   bool  DoPlay(unsigned flags) const;
 
 private:
   bool  DoPlay(unsigned flags) const;
 
 private:

diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h
index 8f5ffdedff7c2ef7eb3a7e035b2ab84847dd4756..e6668e2efc6ccb9eb74b77285e861290fe658701 100644 (file)
--- a/include/wx/osx/spinbutt.h
+++ b/include/wx/osx/spinbutt.h
@@ -57,11 +57,11 @@ public:
     virtual void SetValue(int val);
 
     // implementation
     virtual void SetValue(int val);
 
     // implementation

-    
+

     virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
 
     // osx specific event handling common for all osx-ports
     virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
 
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool OSXHandleClicked( double timestampsec );
 
 protected:
     virtual bool OSXHandleClicked( double timestampsec );
 
 protected:

diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h
index a8831344220f5fdc837d9b98c0b2fed3d7b1654e..6166be7dda58c13ace56294d30b150b9a7b41a23 100644 (file)
--- a/include/wx/osx/srchctrl.h
+++ b/include/wx/osx/srchctrl.h
@@ -69,7 +69,7 @@ protected:
     void Init();
 
     wxMenu *m_menu;
     void Init();
 
     wxMenu *m_menu;

-    
+

     wxString m_descriptiveText;
 
 private:
     wxString m_descriptiveText;
 
 private:

diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index b7b86b08a99707630ccdc50547a28ce6ad6ad959..ccd66cab4259ccb6d357a1a27ae632846107ed7a 100644 (file)
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -44,7 +44,7 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
     virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
     virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;

-    
+

     virtual bool AcceptsFocus() const { return false; }
 
     // protect native font of box
     virtual bool AcceptsFocus() const { return false; }
 
     // protect native font of box

diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 0d4872161346e2e2bbf7293cf747fdc851d7bbde..8d8f3950535e5436142df2353721bfb841adfe94 100644 (file)
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -26,8 +26,8 @@ public:
 #if wxOSX_USE_COCOA
         ,   CUSTOM_STATUSITEM
 #endif
 #if wxOSX_USE_COCOA
         ,   CUSTOM_STATUSITEM
 #endif

-//    ,   STATUSITEM 
-//    ,   MENUEXTRA 
+//    ,   STATUSITEM
+//    ,   MENUEXTRA

         ,   DEFAULT_TYPE = DOCK
         };
 
         ,   DEFAULT_TYPE = DOCK
         };
 


@@ -42,7 +42,7 @@ public:
     bool PopupMenu(wxMenu *menu);
 
 protected:
     bool PopupMenu(wxMenu *menu);
 
 protected:

-    class wxTaskBarIconImpl* m_impl;    
+    class wxTaskBarIconImpl* m_impl;

     friend class wxTaskBarIconImpl;
 };
 #endif
     friend class wxTaskBarIconImpl;
 };
 #endif

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 569227838349d4ea3f0865fe6c7ea744adaa5e49..76f52edf97c72fb0dd161ba8e4681345ea37f81b 100644 (file)
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -185,10 +185,10 @@ protected:
     unsigned long  m_maxLength;
 
     virtual void EnableTextChangedEvents(bool enable)
     unsigned long  m_maxLength;
 
     virtual void EnableTextChangedEvents(bool enable)

-    { 
+    {

         m_triggerUpdateEvents = enable;
     }
         m_triggerUpdateEvents = enable;
     }

-    
+

     bool m_triggerUpdateEvents ;
 
 private :
     bool m_triggerUpdateEvents ;
 
 private :

diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 1babd554b74accdee51c6c19b0c750a009ffa73b..0eee6f3239d791ef614cc2139e4a0cbe6659215f 100644 (file)
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -53,7 +53,7 @@ private:
 
     int m_marginX,
         m_marginY;
 
     int m_marginX,
         m_marginY;

-        
+

 protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;
 protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;

diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index f544bf99def01ce3c220775a7c104349e839e75c..3cc75c482031ddfe2ee854f38f17327cccdb0a65 100644 (file)
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -44,12 +44,12 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual ~wxTopLevelWindowMac();
                 const wxString& name = wxFrameNameStr);
 
     virtual ~wxTopLevelWindowMac();

-    
+

     virtual bool Destroy();
 
     virtual wxPoint GetClientAreaOrigin() const;
 
     virtual bool Destroy();
 
     virtual wxPoint GetClientAreaOrigin() const;
 

-    virtual bool SetShape(const wxRegion& region) 
+    virtual bool SetShape(const wxRegion& region)

         { return DoSetShape(region); }
 
     // Attracts the users attention to this window if the application is
         { return DoSetShape(region); }
 
     // Attracts the users attention to this window if the application is


@@ -71,7 +71,7 @@ public:
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;

-     
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 49d6e54a49143532663bb126818d50311dff1ef6..6614febe9ae048db830c67ca8b5093f5b5a47d52 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -156,7 +156,7 @@ public:
     // this should not be overriden in classes above wxWindowMac
     // because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );
     // this should not be overriden in classes above wxWindowMac
     // because it is called from its destructor via DeleteChildren
     virtual void        RemoveChild( wxWindowBase *child );

-    
+

     virtual bool        MacDoRedraw( long time ) ;
     virtual void        MacPaintChildrenBorders();
     virtual void        MacPaintBorders( int left , int top ) ;
     virtual bool        MacDoRedraw( long time ) ;
     virtual void        MacPaintChildrenBorders();
     virtual void        MacPaintBorders( int left , int top ) ;


@@ -235,12 +235,12 @@ public:
 
     // the 'true' OS level control for this wxWindow
     wxOSXWidgetImpl*       GetPeer() const { return m_peer ; }
 
     // the 'true' OS level control for this wxWindow
     wxOSXWidgetImpl*       GetPeer() const { return m_peer ; }

- 
+

     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
 
     // osx specific event handling common for all osx-ports
     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
 
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool        OSXHandleClicked( double timestampsec );
     virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
 protected:
     virtual bool        OSXHandleClicked( double timestampsec );
     virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
 protected:

diff --git a/include/wx/palmos/font.h b/include/wx/palmos/font.h
index 716fd9a247b79a7c5d019be3a2a580bab9a7af52..736e7bd812d27a66fd3734df039968d6ae5531fb 100644 (file)
--- a/include/wx/palmos/font.h
+++ b/include/wx/palmos/font.h
@@ -47,7 +47,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/palmos/listctrl.h b/include/wx/palmos/listctrl.h
index 91a6eaf5e4da64e537b4e91369122ae3e081a33a..e1f6df59e6461fe98cc7e0b8d1da4ae51a9b0ccb 100644 (file)
--- a/include/wx/palmos/listctrl.h
+++ b/include/wx/palmos/listctrl.h
@@ -377,7 +377,7 @@ protected:
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the icon for the given item. In report view, OnGetItemImage will
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the icon for the given item. In report view, OnGetItemImage will

-    // only be called for the first column. See OnGetItemColumnImage for 
+    // only be called for the first column. See OnGetItemColumnImage for

     // details.
     virtual int OnGetItemImage(long item) const;
 
     // details.
     virtual int OnGetItemImage(long item) const;
 

diff --git a/include/wx/palmos/missing.h b/include/wx/palmos/missing.h
index 111f2fd19e09ab8f711a5e916adac66a3c7f5675..0d0105fb2fea468a2f95bc5f42e1f02c9cb5cdce 100644 (file)
--- a/include/wx/palmos/missing.h
+++ b/include/wx/palmos/missing.h
@@ -3,7 +3,7 @@
  * Purpose:     the missing declarations for wxPalm
  * Author:      Yunhui Fu
  * Created:     2007-10-18
  * Purpose:     the missing declarations for wxPalm
  * Author:      Yunhui Fu
  * Created:     2007-10-18

- * Modified by: 
+ * Modified by:

  * RCS-ID:      $Id$
  * Copyright:   (c) 2007 Yunhui Fu
  * Licence:     wxWindows licence
  * RCS-ID:      $Id$
  * Copyright:   (c) 2007 Yunhui Fu
  * Licence:     wxWindows licence


@@ -305,13 +305,13 @@ union __dmath
   unsigned long i[2];
   double d;
 };
   unsigned long i[2];
   double d;
 };

- 
+

 union __fmath
 {
   unsigned long i[1];
   float f;
 };
 union __fmath
 {
   unsigned long i[1];
   float f;
 };

- 
+

 union __ldmath
 {
   unsigned long i[4];
 union __ldmath
 {
   unsigned long i[4];


@@ -337,9 +337,9 @@ union __ldmath
 
 #else /* !gcc >= 3.3  */
 
 
 #else /* !gcc >= 3.3  */
 

- /* No builtins.  Use floating-point unions instead.  Declare as an array 
-    without bounds so no matter what small data support a port and/or 
-    library has, the reference will be via the general method for accessing 
+ /* No builtins.  Use floating-point unions instead.  Declare as an array
+    without bounds so no matter what small data support a port and/or
+    library has, the reference will be via the general method for accessing

     globals. */
 
  #ifndef HUGE_VAL
     globals. */
 
  #ifndef HUGE_VAL


@@ -417,9 +417,9 @@ extern int eof(int fd);
 extern int access(const char *path, int amode);
 extern off_t lseek(int fildes, off_t offset, int whence);
 
 extern int access(const char *path, int amode);
 extern off_t lseek(int fildes, off_t offset, int whence);
 

-//TxtCharIsAlNum 
+//TxtCharIsAlNum

 //#define isalpha(a) TxtCharIsAlpha(a)
 //#define isalpha(a) TxtCharIsAlpha(a)

-//TxtCharIsCntrl TxtCharIsDelim TxtCharIsDigit TxtCharIsGraph TxtCharIsHardKey TxtCharIsHex TxtCharIsLower TxtCharIsPrint TxtCharIsPunct TxtCharIsSpace TxtCharIsUpper 
+//TxtCharIsCntrl TxtCharIsDelim TxtCharIsDigit TxtCharIsGraph TxtCharIsHardKey TxtCharIsHex TxtCharIsLower TxtCharIsPrint TxtCharIsPunct TxtCharIsSpace TxtCharIsUpper

 
 #include "pfall.h"
 
 
 #include "pfall.h"
 

diff --git a/include/wx/palmos/textctrl.h b/include/wx/palmos/textctrl.h
index 4d9fc4c4140ded2c68f5cdb3a523c6176b13e945..be27ddbaa885f5080626b342a7af92d9177a1274 100644 (file)
--- a/include/wx/palmos/textctrl.h
+++ b/include/wx/palmos/textctrl.h
@@ -138,7 +138,7 @@ public:
 
     // Implementation from now on
     // --------------------------
 
     // Implementation from now on
     // --------------------------

- 
+

 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6e07657e07dec00371106ae16e5a6143b57aff40..abb2278afbf22a3500be8beed245cd3445c136f0 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -38,7 +38,7 @@
 #define __WXOSX_CARBON__ 1
 #endif
 
 #define __WXOSX_CARBON__ 1
 #endif
 

-#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) 
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)

 #   define __WXOSX__ 1
 #endif
 
 #   define __WXOSX__ 1
 #endif
 


@@ -49,7 +49,7 @@
 #   endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>
 #   endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>

-#   if defined(__WXOSX_IPHONE__) 
+#   if defined(__WXOSX_IPHONE__)

 #       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
 #           error "incorrect SDK for an iPhone build"
 #       endif
 #       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
 #           error "incorrect SDK for an iPhone build"
 #       endif


@@ -678,21 +678,21 @@
 #endif
 /* also the 32/64 bit universal builds must be handled accordingly */
 #ifdef __DARWIN__
 #endif
 /* also the 32/64 bit universal builds must be handled accordingly */
 #ifdef __DARWIN__

-#      ifdef __LP64__
-#              undef SIZEOF_VOID_P 
-#              undef SIZEOF_LONG 
-#              undef SIZEOF_SIZE_T 
-#              define SIZEOF_VOID_P 8
-#              define SIZEOF_LONG 8
-#              define SIZEOF_SIZE_T 8
-#      else
-#              undef SIZEOF_VOID_P 
-#              undef SIZEOF_LONG 
-#              undef SIZEOF_SIZE_T 
-#              define SIZEOF_VOID_P 4
-#              define SIZEOF_LONG 4
-#              define SIZEOF_SIZE_T 4
-#      endif
+#    ifdef __LP64__
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 8
+#        define SIZEOF_LONG 8
+#        define SIZEOF_SIZE_T 8
+#    else
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 4
+#        define SIZEOF_LONG 4
+#        define SIZEOF_SIZE_T 4
+#    endif

 #endif
 /*
    check the consistency of the settings in setup.h: note that this must be
 #endif
 /*
    check the consistency of the settings in setup.h: note that this must be

diff --git a/include/wx/platinfo.h b/include/wx/platinfo.h
index cb2de2f3fdc0f777946a93a163fe319dd2d4f79e..cca996b27f41bea5f09d0febd597bdf74b66f66e 100644 (file)
--- a/include/wx/platinfo.h
+++ b/include/wx/platinfo.h
@@ -121,15 +121,15 @@ struct wxLinuxDistributionInfo
     wxString Release;
     wxString CodeName;
     wxString Description;
     wxString Release;
     wxString CodeName;
     wxString Description;

-    
+

     bool operator==(const wxLinuxDistributionInfo& ldi) const
     bool operator==(const wxLinuxDistributionInfo& ldi) const

-    { 
+    {

         return Id == ldi.Id &&
                Release == ldi.Release &&
                CodeName == ldi.CodeName &&
                Description == ldi.Description;
     }
         return Id == ldi.Id &&
                Release == ldi.Release &&
                CodeName == ldi.CodeName &&
                Description == ldi.Description;
     }

-    
+

     bool operator!=(const wxLinuxDistributionInfo& ldi) const
     { return !(*this == ldi); }
 };
     bool operator!=(const wxLinuxDistributionInfo& ldi) const
     { return !(*this == ldi); }
 };


@@ -186,7 +186,7 @@ public:
     static wxString GetArchName(wxArchitecture arch);
     static wxString GetEndiannessName(wxEndianness end);
 
     static wxString GetArchName(wxArchitecture arch);
     static wxString GetEndiannessName(wxEndianness end);
 

-    
+

     // getters
     // -----------------
 
     // getters
     // -----------------
 


@@ -251,11 +251,11 @@ public:
         { return m_osDesc; }
     wxString GetDesktopEnvironment() const
         { return m_desktopEnv; }
         { return m_osDesc; }
     wxString GetDesktopEnvironment() const
         { return m_desktopEnv; }

-        
+

     static wxString GetOperatingSystemDirectory();
         // doesn't make sense to store inside wxPlatformInfo the OS directory,
         // thus this function is static; note that this function simply calls
     static wxString GetOperatingSystemDirectory();
         // doesn't make sense to store inside wxPlatformInfo the OS directory,
         // thus this function is static; note that this function simply calls

-        // wxGetOSDirectory() and is here just to make it easier for the user to 
+        // wxGetOSDirectory() and is here just to make it easier for the user to

         // find it that feature (global functions can be difficult to find in the docs)
 
     // setters
         // find it that feature (global functions can be difficult to find in the docs)
 
     // setters


@@ -276,7 +276,7 @@ public:
         { m_arch = n; }
     void SetEndianness(wxEndianness n)
         { m_endian = n; }
         { m_arch = n; }
     void SetEndianness(wxEndianness n)
         { m_endian = n; }

-        
+

     void SetDesktopEnvironment(const wxString& de)
         { m_desktopEnv = de; }
     void SetLinuxDistributionInfo(const wxLinuxDistributionInfo& di)
     void SetDesktopEnvironment(const wxString& de)
         { m_desktopEnv = de; }
     void SetLinuxDistributionInfo(const wxLinuxDistributionInfo& di)


@@ -293,9 +293,9 @@ public:
                !m_osDesc.IsEmpty() &&
                m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
                m_port != wxPORT_UNKNOWN &&
                !m_osDesc.IsEmpty() &&
                m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
                m_port != wxPORT_UNKNOWN &&

-               m_arch != wxARCH_INVALID && 
+               m_arch != wxARCH_INVALID &&

                m_endian != wxENDIAN_INVALID;
                m_endian != wxENDIAN_INVALID;

-               
+

                // do not check linux-specific info; it's ok to have them empty
     }
 
                // do not check linux-specific info; it's ok to have them empty
     }
 


@@ -319,14 +319,14 @@ protected:
 
     // Operating system ID.
     wxOperatingSystemId m_os;
 
     // Operating system ID.
     wxOperatingSystemId m_os;

-    
+

     // Operating system description.
     wxString m_osDesc;
     // Operating system description.
     wxString m_osDesc;

-    
-    
+
+

     // linux-specific
     // -----------------
     // linux-specific
     // -----------------

-    
+

     wxString m_desktopEnv;
     wxLinuxDistributionInfo m_ldi;
 
     wxString m_desktopEnv;
     wxLinuxDistributionInfo m_ldi;
 

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 757f822eedcb1a8b18ce4da8b8438ce00f48d6fa..cd21282f1303373e2898c450f80b595054a65661 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -36,11 +36,11 @@ public:
                       const wxPoint &pos = wxDefaultPosition,
                       const wxSize &size = wxDefaultSize,
                       long style = wxDEFAULT_DIALOG_STYLE);
                       const wxPoint &pos = wxDefaultPosition,
                       const wxSize &size = wxDefaultSize,
                       long style = wxDEFAULT_DIALOG_STYLE);

-            
+

     virtual wxPrintDialogData& GetPrintDialogData() = 0;
     virtual wxPrintData& GetPrintData() = 0;
     virtual wxDC *GetPrintDC() = 0;
     virtual wxPrintDialogData& GetPrintDialogData() = 0;
     virtual wxPrintData& GetPrintData() = 0;
     virtual wxDC *GetPrintDC() = 0;

-    
+

 private:
     DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)
     wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)
     wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);


@@ -62,10 +62,10 @@ public:
     virtual wxPrintDialogData& GetPrintDialogData();
     virtual wxPrintData& GetPrintData();
     virtual wxDC *GetPrintDC();
     virtual wxPrintDialogData& GetPrintDialogData();
     virtual wxPrintData& GetPrintData();
     virtual wxDC *GetPrintDC();

-    
+

 private:
     wxPrintDialogBase  *m_pimpl;
 private:
     wxPrintDialogBase  *m_pimpl;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
     wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
     wxDECLARE_NO_COPY_CLASS(wxPrintDialog);


@@ -110,7 +110,7 @@ public:
 
 private:
     wxPageSetupDialogBase  *m_pimpl;
 
 private:
     wxPageSetupDialogBase  *m_pimpl;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
     wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
     wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);

diff --git a/include/wx/process.h b/include/wx/process.h
index 12d1dcce7cb20443b296629bc7305a4bac84908a..2f1027ae64d76cd3999892e66d4a53b7c97f4014 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -106,7 +106,7 @@ public:
 
     // implementation only - don't use!
     // --------------------------------
 
     // implementation only - don't use!
     // --------------------------------

-    
+

     // needs to be public since it needs to be used from wxExecute() global func
     void SetPid(long pid) { m_pid = pid; }
 
     // needs to be public since it needs to be used from wxExecute() global func
     void SetPid(long pid) { m_pid = pid; }
 

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index e2f3adea9af3d2c04ea4af834fe9613c2b5b1fae..45a60693b0b96bdbc16f15c20c991460b2a5aa89 100644 (file)
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -432,7 +432,7 @@ protected:
     <b>Supported special attributes:</b>
     - "DateFormat": Determines displayed date format.
     - "PickerStyle": Determines window style used with wxDatePickerCtrl.
     <b>Supported special attributes:</b>
     - "DateFormat": Determines displayed date format.
     - "PickerStyle": Determines window style used with wxDatePickerCtrl.

-       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE 
+       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE

        enables additional support for unspecified property value.
 */
 class WXDLLIMPEXP_PROPGRID wxDateProperty : public wxPGProperty
        enables additional support for unspecified property value.
 */
 class WXDLLIMPEXP_PROPGRID wxDateProperty : public wxPGProperty

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index a6a55f0bc252984f5fc5755ce7c03823c8c65e40..bddf659f98a9efe1289fde1d8a5fc879f4007beb 100644 (file)
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -731,7 +731,7 @@ private:
     Helper class for managing choices of wxPropertyGrid properties.
     Each entry can have label, value, bitmap, text colour, and background
     colour.
     Helper class for managing choices of wxPropertyGrid properties.
     Each entry can have label, value, bitmap, text colour, and background
     colour.

- 
+

     wxPGChoices uses reference counting, similar to other wxWidgets classes.
     This means that assignment operator and copy constructor only copy the
     reference and not the actual data. Use Copy() member function to create a
     wxPGChoices uses reference counting, similar to other wxWidgets classes.
     This means that assignment operator and copy constructor only copy the
     reference and not the actual data. Use Copy() member function to create a

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 120c6b308bad5ea54ea7b64ce2060255b7b96d52..b33c55ed3655331e5cb16bcb89dfd8090438baa2 100644 (file)
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -248,7 +248,7 @@ wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES    = 0x00400000,
 /** Hides page selection buttons from toolbar.
 */
 wxPG_EX_HIDE_PAGE_BUTTONS               = 0x01000000,
 /** Hides page selection buttons from toolbar.
 */
 wxPG_EX_HIDE_PAGE_BUTTONS               = 0x01000000,

- 
+

 /** Allows multiple properties to be selected by user (by pressing SHIFT
     when clicking on a property, or by dragging with left mouse button
     down).
 /** Allows multiple properties to be selected by user (by pressing SHIFT
     when clicking on a property, or by dragging with left mouse button
     down).

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index c9c19f284b06c46466b9caf444d3a6d0557dbb8f..5ee90ae3dd541c3ec1b5a42b63e7271ee2eb55b5 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -29,9 +29,9 @@ protected:
     size_t OnSysWrite(const void *buffer, size_t bufsize);
 
     // socket streams are both un-seekable and size-less streams:
     size_t OnSysWrite(const void *buffer, size_t bufsize);
 
     // socket streams are both un-seekable and size-less streams:

-    wxFileOffset OnSysTell() const 
+    wxFileOffset OnSysTell() const

         { return wxInvalidOffset; }
         { return wxInvalidOffset; }

-    wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) 
+    wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode))

         { return wxInvalidOffset; }
 
     wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream);
         { return wxInvalidOffset; }
 
     wxDECLARE_NO_COPY_CLASS(wxSocketOutputStream);


@@ -50,9 +50,9 @@ protected:
 
     // socket streams are both un-seekable and size-less streams:
 
 
     // socket streams are both un-seekable and size-less streams:
 

-    wxFileOffset OnSysTell() const 
+    wxFileOffset OnSysTell() const

         { return wxInvalidOffset; }
         { return wxInvalidOffset; }

-    wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode)) 
+    wxFileOffset OnSysSeek(wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode))

         { return wxInvalidOffset; }
 
     wxDECLARE_NO_COPY_CLASS(wxSocketInputStream);
         { return wxInvalidOffset; }
 
     wxDECLARE_NO_COPY_CLASS(wxSocketInputStream);

diff --git a/include/wx/setup_gccxml.h b/include/wx/setup_gccxml.h
index c356c8cb1c2b274f436e2f6aa4d8b4966f4cc0e0..baa6cbd96f3081f6df20adea7a00b0b3c8b0d74b 100644 (file)
--- a/include/wx/setup_gccxml.h
+++ b/include/wx/setup_gccxml.h
@@ -10,13 +10,13 @@
 
 /*
     This file is included by wx/platform.h when gccxml is detected.
 
 /*
     This file is included by wx/platform.h when gccxml is detected.

-    
-    Here we fix some of the things declared in the real setup.h which gccxml doesn't 
+
+    Here we fix some of the things declared in the real setup.h which gccxml doesn't

     like.
 */
 
 
     like.
 */
 
 

-// gccxml 0.9.0 doesn't like the fcntl2.h which is part of GNU C library 
+// gccxml 0.9.0 doesn't like the fcntl2.h which is part of GNU C library

 // (at least it doesn't on x86_64 systems!)
 #define _FCNTL_H
 int open (const char *__path, int __oflag, ...);
 // (at least it doesn't on x86_64 systems!)
 #define _FCNTL_H
 int open (const char *__path, int __oflag, ...);

diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 948aa2c0cefa464d7449a4673607831c064321da..9b08f60a144e134d4b66d0a89d85eac99055e4ef 100644 (file)
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -17,7 +17,7 @@
 
 #include "wx/textctrl.h"
 
 
 #include "wx/textctrl.h"
 

-#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__) 
+#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__)

     // search control was introduced in Mac OS X 10.3 Panther
     #define wxUSE_NATIVE_SEARCH_CONTROL 1
 
     // search control was introduced in Mac OS X 10.3 Panther
     #define wxUSE_NATIVE_SEARCH_CONTROL 1
 

diff --git a/include/wx/string.h b/include/wx/string.h
index 9ed73f5b825cb3e2cadac61f491461e341e5618e..9ab7f3f10a1688e04b67fe46fdce1871ea2c6e88 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -2273,7 +2273,7 @@ public:
       // convert to a double
   bool ToCDouble(double *val) const;
 #endif
       // convert to a double
   bool ToCDouble(double *val) const;
 #endif

-  
+

 #ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
   // formatted input/output
     // as sprintf(), returns the number of characters written or < 0 on error
 #ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
   // formatted input/output
     // as sprintf(), returns the number of characters written or < 0 on error

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 8d6b5eef26e693bd4f5bf3d00bcfb24e8c99f1d8..a5fb510039fcb830484508d9ff69666ba75e4479 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -170,7 +170,7 @@ public:
     virtual wxString GetTitle() const = 0;
 
     // enable/disable close button [x]
     virtual wxString GetTitle() const = 0;
 
     // enable/disable close button [x]

-    virtual bool EnableCloseButton(bool WXUNUSED(enable) ) { return false; } 
+    virtual bool EnableCloseButton(bool WXUNUSED(enable) ) { return false; }

 
     // Set the shape of the window to the given region.
     // Returns true if the platform supports this feature (and the
 
     // Set the shape of the window to the given region.
     // Returns true if the platform supports this feature (and the

diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index 27d3fbd022d353b50835e416694a8fa8b06a9c39..b598e8874f19c23cb1a1efdd2c8324d2dada96ef 100644 (file)
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -15,7 +15,7 @@
 #include "wx/combobox.h"
 
 // VS: This is only a *temporary* implementation, real wxChoice should not
 #include "wx/combobox.h"
 
 // VS: This is only a *temporary* implementation, real wxChoice should not

-//     derive from wxComboBox and may have different l&f 
+//     derive from wxComboBox and may have different l&f

 class WXDLLIMPEXP_CORE wxChoice : public wxComboBox
 {
 public:
 class WXDLLIMPEXP_CORE wxChoice : public wxComboBox
 {
 public:


@@ -52,10 +52,10 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);

-    
+

 private:
     void OnComboBox(wxCommandEvent &event);
 private:
     void OnComboBox(wxCommandEvent &event);

-    
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 087dbe59af70aa0c6394360c73532cccdacb51b9..6646ad91c7f85fa95c235bd248ae39a9808af47f 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -83,7 +83,7 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)

-        : wxScrollHelper(this) 
+        : wxScrollHelper(this)

     {
         Init();
 
     {
         Init();
 

diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index 76a27cc59b8e40448faca52f3a5e283848d87563..fdff54437c18c2c72c46a5f5fa47430bfa67eb6a 100644 (file)
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -79,7 +79,7 @@ protected:
 
     wxString GetCommand(const wxString &verb, size_t nIndex) const;
 
 
     wxString GetCommand(const wxString &verb, size_t nIndex) const;
 

-    // Read XDG *.desktop file 
+    // Read XDG *.desktop file

     void LoadXDGApp(const wxString& filename);
     // Scan XDG directory
     void LoadXDGAppsFilesFromDir(const wxString& dirname);
     void LoadXDGApp(const wxString& filename);
     // Scan XDG directory
     void LoadXDGAppsFilesFromDir(const wxString& dirname);

diff --git a/include/wx/vms_x_fix.h b/include/wx/vms_x_fix.h
index 9b8998448da13301ebd676fbed5368c06337c203..8d34abd7e67d6306afd221f96f7922753e5d99b2 100644 (file)
--- a/include/wx/vms_x_fix.h
+++ b/include/wx/vms_x_fix.h
@@ -689,7 +689,7 @@
 #define XtCallCallbackList XTCALLCALLBACKLIST
 #define XtCallCallbacks XTCALLCALLBACKS
 #define XtCallConverter XTCALLCONVERTER
 #define XtCallCallbackList XTCALLCALLBACKLIST
 #define XtCallCallbacks XTCALLCALLBACKS
 #define XtCallConverter XTCALLCONVERTER

-#define XtCalloc XTCALLOC 
+#define XtCalloc XTCALLOC

 #ifndef NOXTDISPLAY
 #define XtClass XTCLASS
 #endif
 #ifndef NOXTDISPLAY
 #define XtClass XTCLASS
 #endif


@@ -798,7 +798,7 @@
 #define XtSetTypeConverter XTSETTYPECONVERTER
 #define XtSetValues XTSETVALUES
 #define XtShellStrings XTSHELLSTRINGS
 #define XtSetTypeConverter XTSETTYPECONVERTER
 #define XtSetValues XTSETVALUES
 #define XtShellStrings XTSHELLSTRINGS

-#define XtStringConversionWarning XTSTRINGCONVERSIONWARNING 
+#define XtStringConversionWarning XTSTRINGCONVERSIONWARNING

 #define XtStrings XTSTRINGS
 #define XtToolkitInitialize XTTOOLKITINITIALIZE
 #define XtTranslateCoords XTTRANSLATECOORDS
 #define XtStrings XTSTRINGS
 #define XtToolkitInitialize XTTOOLKITINITIALIZE
 #define XtTranslateCoords XTTRANSLATECOORDS


@@ -837,11 +837,11 @@
 #define _XEatData _XEATDATA
 #define _XFlush _XFLUSH
 #define _XFreeTemp _XFREETEMP
 #define _XEatData _XEATDATA
 #define _XFlush _XFLUSH
 #define _XFreeTemp _XFREETEMP

-#define _XGetAsyncReply _XGETASYNCREPLY 
+#define _XGetAsyncReply _XGETASYNCREPLY

 #define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
 #define _XRead _XREAD
 #define _XReadPad _XREADPAD
 #define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
 #define _XRead _XREAD
 #define _XReadPad _XREADPAD

-#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE 
+#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE

 #define _XReply _XREPLY
 #define _XSend _XSEND
 #define _XUnregisterFilter _XUNREGISTERFILTER
 #define _XReply _XREPLY
 #define _XSend _XSEND
 #define _XUnregisterFilter _XUNREGISTERFILTER


@@ -1193,7 +1193,7 @@
 #define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
 #define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
 
 #define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
 #define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
 

-#if (__VMS_VER < 80200000) 
+#if (__VMS_VER < 80200000)

 # define SetReqLen(req,n,badlen) \
     if ((req->length + n) > (unsigned)65535) { \
         n = badlen; \
 # define SetReqLen(req,n,badlen) \
     if ((req->length + n) > (unsigned)65535) { \
         n = badlen; \

diff --git a/include/wx/vscroll.h b/include/wx/vscroll.h
index d2ebbdc5086e07b22b6bf2fd0de751023eed047e..bfb1b252afbbb279117a63fdee431520ae235874 100644 (file)
--- a/include/wx/vscroll.h
+++ b/include/wx/vscroll.h
@@ -840,7 +840,7 @@ public:
                        long style = 0,
                        const wxString& name = wxPanelNameStr)
         : wxPanel(),
                        long style = 0,
                        const wxString& name = wxPanelNameStr)
         : wxPanel(),

-          wxVarHVScrollHelper(this) 
+          wxVarHVScrollHelper(this)

     {
         (void)Create(parent, id, pos, size, style, name);
     }
     {
         (void)Create(parent, id, pos, size, style, name);
     }

diff --git a/include/wx/wx_cwcocoa_cm.h b/include/wx/wx_cwcocoa_cm.h
index 0386d299ddd38c683bb251725aaf78ab78ce6cfd..df94434a3e2abf3e1b3ba7367aaf7041ac34f6b3 100644 (file)
--- a/include/wx/wx_cwcocoa_cm.h
+++ b/include/wx/wx_cwcocoa_cm.h
@@ -77,7 +77,7 @@
     */
 #elif defined( __WXCOCOA__) //tommy
     #if defined(__OBJC__)
     */
 #elif defined( __WXCOCOA__) //tommy
     #if defined(__OBJC__)

-        #include "CocoaHeaders.m"        
+        #include "CocoaHeaders.m"

     #endif //defined(__OBJC__)
 #endif
 
     #endif //defined(__OBJC__)
 #endif
 

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 5f665b878ecacdc8367fe13eac759d376261e9ed..d8a52480036145d95e3dbec760072f9e4ff6456e 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -26,7 +26,7 @@
 
     NB: don't include any wxWidgets headers here because almost all of them
         include this one!
 
     NB: don't include any wxWidgets headers here because almost all of them
         include this one!

-        
+

     NB2: User code should include wx/crt.h instead of including this
          header directly.
 
     NB2: User code should include wx/crt.h instead of including this
          header directly.
 

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 7feefa2bd350d42553615dd3d21468e671765cb3..a00b4a7b1e8418d8ac0ae47712821c524818068e 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -20,7 +20,7 @@
     defined(__MWERKS__)    || \
     defined(__WATCOMC__)   || \
     defined(__BORLANDC__)
     defined(__MWERKS__)    || \
     defined(__WATCOMC__)   || \
     defined(__BORLANDC__)

-         
+

 
     // If user did not request NOCPH and we're not building using configure
     // then assume user wants precompiled headers.
 
     // If user did not request NOCPH and we're not building using configure
     // then assume user wants precompiled headers.

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index e60874f815b7fa0f8a6b1ea832e0980427792e33..2a272f92c2483c4245c8cc712a7a4bfeab333a49 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -68,7 +68,7 @@ public:
     wxBitmap() {}
     wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); }
     wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); }
     wxBitmap() {}
     wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); }
     wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); }

-    
+

     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
 #ifdef wxNEEDS_CHARPP
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
 #ifdef wxNEEDS_CHARPP

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index 56a956093f6c6f64665d9ba10a7a44f0c09fce16..3c3152c73290f67330e44bfdfb74f5332600060a 100644 (file)
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -17,15 +17,15 @@ class WXDLLIMPEXP_CORE wxDataFormat
 public:
     // the clipboard formats under Xt are Atoms
     typedef Atom NativeFormat;
 public:
     // the clipboard formats under Xt are Atoms
     typedef Atom NativeFormat;

-    
+

     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat( NativeFormat format );
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat( NativeFormat format );

-    
+

     wxDataFormat& operator=(NativeFormat format)
         { SetId(format); return *this; }
     wxDataFormat& operator=(NativeFormat format)
         { SetId(format); return *this; }

-    
+

     // comparison (must have both versions)
     bool operator==(NativeFormat format) const
         { return m_format == (NativeFormat)format; }
     // comparison (must have both versions)
     bool operator==(NativeFormat format) const
         { return m_format == (NativeFormat)format; }


@@ -35,27 +35,27 @@ public:
         { return m_type == (wxDataFormatId)format; }
     bool operator!=(wxDataFormatId format) const
         { return m_type != (wxDataFormatId)format; }
         { return m_type == (wxDataFormatId)format; }
     bool operator!=(wxDataFormatId format) const
         { return m_type != (wxDataFormatId)format; }

-    
+

     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the
     // compatibility with old code)
     NativeFormat GetFormatId() const { return m_format; }
     operator NativeFormat() const { return m_format; }
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the
     // compatibility with old code)
     NativeFormat GetFormatId() const { return m_format; }
     operator NativeFormat() const { return m_format; }

-    
+

     void SetId( NativeFormat format );
     void SetId( NativeFormat format );

-    
+

     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     void SetId( const wxString& id );
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     void SetId( const wxString& id );

-    
+

     // implementation
     wxDataFormatId GetType() const;
     // implementation
     wxDataFormatId GetType() const;

-    
+

 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;

-    
+

     void PrepareFormats();
     void SetType( wxDataFormatId type );
 };
     void PrepareFormats();
     void SetType( wxDataFormatId type );
 };

diff --git a/include/wx/x11/dataobj.h b/include/wx/x11/dataobj.h
index 6ec1bcad39453c669972d702dee06e77b45853b4..068cedbbf083ddee25c1106266597293503dc4ea 100644 (file)
--- a/include/wx/x11/dataobj.h
+++ b/include/wx/x11/dataobj.h
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
 {
 public:
     wxDataObject();
 {
 public:
     wxDataObject();

-    
+

 #ifdef __DARWIN__
     virtual ~wxDataObject() { }
 #endif
 #ifdef __DARWIN__
     virtual ~wxDataObject() { }
 #endif

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index e3a52fe81c930c0bb1a170cdadfb9bc9c876e4cd..951c030b123e87ca62a3084ff8db23b12fa5de5a 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxX11DCImpl
 public:
     wxWindowDCImpl( wxDC *owner );
     wxWindowDCImpl( wxDC *owner, wxWindow *win );
 public:
     wxWindowDCImpl( wxDC *owner );
     wxWindowDCImpl( wxDC *owner, wxWindow *win );

-        
+

     virtual ~wxWindowDCImpl();
 
     virtual bool CanDrawBitmap() const { return true; }
     virtual ~wxWindowDCImpl();
 
     virtual bool CanDrawBitmap() const { return true; }


@@ -40,7 +40,7 @@ public:
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;

-    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, 
+    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,

                               wxFloodFillStyle style = wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
 
                               wxFloodFillStyle style = wxFLOOD_SURFACE );
     virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
 


@@ -70,7 +70,7 @@ protected:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-        wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+        wxRasterOperationMode rop = wxCOPY, bool useMask = false,

         wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,

diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index 687fea8ffa4f2e21bc413c5836421c9b085889ef..30ed3ab846bea77488f30ab299b65a149fc22984 100644 (file)
--- a/include/wx/x11/dcmemory.h
+++ b/include/wx/x11/dcmemory.h
@@ -26,7 +26,7 @@ public:
 
     virtual const wxBitmap& GetSelectedBitmap() const;
     virtual wxBitmap& GetSelectedBitmap();
 
     virtual const wxBitmap& GetSelectedBitmap() const;
     virtual wxBitmap& GetSelectedBitmap();

-    
+

     // implementation
     wxBitmap  m_selected;
 
     // implementation
     wxBitmap  m_selected;
 

diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h
index db9bb5b9927d7fd350a5a63732a4df728ea57357..69ab60ddeb23d6b5ca3796725dcfb2be7e95adbe 100644 (file)
--- a/include/wx/x11/dnd.h
+++ b/include/wx/x11/dnd.h
@@ -39,19 +39,19 @@ class WXDLLIMPEXP_FWD_CORE wxDropSource;
 class WXDLLIMPEXP_CORE wxDropTarget: public wxObject
 {
 public:
 class WXDLLIMPEXP_CORE wxDropTarget: public wxObject
 {
 public:

-    
+

     wxDropTarget();
     virtual ~wxDropTarget();
     wxDropTarget();
     virtual ~wxDropTarget();

-    
+

     virtual void OnEnter() { }
     virtual void OnLeave() { }
     virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;
     virtual void OnEnter() { }
     virtual void OnLeave() { }
     virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;

-    
-    // Override these to indicate what kind of data you support: 
-    
+
+    // Override these to indicate what kind of data you support:
+

     virtual size_t GetFormatCount() const = 0;
     virtual wxDataFormat GetFormat(size_t n) const = 0;
     virtual size_t GetFormatCount() const = 0;
     virtual wxDataFormat GetFormat(size_t n) const = 0;

-    
+

     // implementation
 };
 
     // implementation
 };
 


@@ -62,13 +62,13 @@ public:
 class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
 {
 public:
 class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
 {
 public:

-    
+

     wxTextDropTarget() {};
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );
     wxTextDropTarget() {};
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );

-    
+

 protected:
 protected:

-    
+

     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };


@@ -80,26 +80,26 @@ protected:
 class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget
 {
 public:
 class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget
 {
 public:

-    
+

     wxPrivateDropTarget();
     wxPrivateDropTarget();

-    
+

     // you have to override OnDrop to get at the data
     // you have to override OnDrop to get at the data

-    
+

     // the string ID identifies the format of clipboard or DnD data. a word
     // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
     // to the clipboard - the latter with the Id "WXWORD_FORMAT".
     // the string ID identifies the format of clipboard or DnD data. a word
     // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
     // to the clipboard - the latter with the Id "WXWORD_FORMAT".

-    
+

     void SetId( const wxString& id )
     { m_id = id; }
     void SetId( const wxString& id )
     { m_id = id; }

-    
+

     wxString GetId()
     { return m_id; }
     wxString GetId()
     { return m_id; }

-    
+

 private:
 private:

-    
+

     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;

-    
+

     wxString   m_id;
 };
 
     wxString   m_id;
 };
 


@@ -110,15 +110,15 @@ private:
 class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
 {
 public:
 class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
 {
 public:

-    
+

     wxFileDropTarget() {};
     wxFileDropTarget() {};

-    
+

     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDrop( long x, long y, const void *data, size_t size );

-    virtual bool OnDropFiles( long x, long y, 
+    virtual bool OnDropFiles( long x, long y,

         size_t nFiles, const char * const aszFiles[] );
         size_t nFiles, const char * const aszFiles[] );

-    
+

 protected:
 protected:

-    
+

     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
 };


@@ -139,26 +139,26 @@ enum wxDragResult
 class WXDLLIMPEXP_CORE wxDropSource: public wxObject
 {
 public:
 class WXDLLIMPEXP_CORE wxDropSource: public wxObject
 {
 public:

-    
+

     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );

-    
+

     virtual ~wxDropSource(void);
     virtual ~wxDropSource(void);

-    
+

     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);

-    
+

     virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
     virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };

-    
+

     // implementation
 #if 0
     void RegisterWindow(void);
     void UnregisterWindow(void);
     // implementation
 #if 0
     void RegisterWindow(void);
     void UnregisterWindow(void);

-    
+

     wxWindow      *m_window;
     wxDragResult   m_retValue;
     wxDataObject  *m_data;
     wxWindow      *m_window;
     wxDragResult   m_retValue;
     wxDataObject  *m_data;

-    
+

     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
 #endif
     wxCursor      m_defaultCursor;
     wxCursor      m_goaheadCursor;
 #endif


@@ -168,6 +168,6 @@ public:
 
 // wxUSE_DRAG_AND_DROP
 
 
 // wxUSE_DRAG_AND_DROP
 

-#endif  
+#endif

 //_WX_DND_H_
 
 //_WX_DND_H_
 

diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index bfe33ee3e0d75f8f71ddcbfbe9d84a1cf9b0798b..ac9710472d17ed99bd9d7e71e3ca7b419c4e3e78 100644 (file)
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -44,7 +44,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,


@@ -56,7 +56,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }

-    
+

     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,

diff --git a/include/wx/x11/nanox/X11/Xlib.h b/include/wx/x11/nanox/X11/Xlib.h
index d0c299ff78508bb2f45962db11a6f4bb4fc87d42..0e3aed4d23ae129f97132ac7ac715e7e339de0ca 100644 (file)
--- a/include/wx/x11/nanox/X11/Xlib.h
+++ b/include/wx/x11/nanox/X11/Xlib.h
@@ -44,7 +44,7 @@ typedef struct {
 #define   CWStackMode                 (1<<6)
 
 /* Values */
 #define   CWStackMode                 (1<<6)
 
 /* Values */

- 
+

 typedef struct {
         int x, y;
         int width, height;
 typedef struct {
         int x, y;
         int width, height;

diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h
index 1524e80c5dafefdc2133c28368341ace8676ff67..69feea7844e51b545385492ad8bf0a4c87d5c34b 100644 (file)
--- a/include/wx/x11/popupwin.h
+++ b/include/wx/x11/popupwin.h
@@ -27,7 +27,7 @@ public:
 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }

-        
+

     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
     virtual bool Show( bool show = TRUE );
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
     virtual bool Show( bool show = TRUE );


@@ -37,7 +37,7 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

-                           
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 36f5ac2ce74a416091b2cd5c87dd01368d51341b..4767a9431d39ed2644ecad63f522b77c0f788b4b 100644 (file)
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -167,7 +167,7 @@ public:
     int                   m_visualRedPrec;
     int                   m_visualGreenPrec;
     int                   m_visualBluePrec;
     int                   m_visualRedPrec;
     int                   m_visualGreenPrec;
     int                   m_visualBluePrec;

-    
+

     unsigned char        *m_colorCube;
 };
 
     unsigned char        *m_colorCube;
 };
 

diff --git a/include/wx/x11/reparent.h b/include/wx/x11/reparent.h
index b32d43f71c831777ee9c58e9f93fd3059d80d7a2..e1121be4eb3df82f07dcd9409922e5690baee696 100644 (file)
--- a/include/wx/x11/reparent.h
+++ b/include/wx/x11/reparent.h
@@ -39,7 +39,7 @@ protected:
 
     bool ProcessXEvent(WXEvent* event);
     WXWindow FindAClientWindow(WXWindow window, const wxString& name);
 
     bool ProcessXEvent(WXEvent* event);
     WXWindow FindAClientWindow(WXWindow window, const wxString& name);

-    
+

     static bool sm_done;
     static wxAdoptedWindow* sm_toReparent;
     static wxWindow* sm_newParent;
     static bool sm_done;
     static wxAdoptedWindow* sm_toReparent;
     static wxWindow* sm_newParent;

diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index bf8f8daf071e12f095da95dc9dc2e3f4517fbabb..936e3fc39e4700f348595fb5449786077f598cc8 100644 (file)
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -18,7 +18,7 @@
     using decimal point &c.
 
     TODO: Currently only the character classification and transformation
     using decimal point &c.
 
     TODO: Currently only the character classification and transformation

-          functions and number <-> string functions, are implemented, 
+          functions and number <-> string functions, are implemented,

           we also need at least
             - formatted IO: scanf_l(), printf_l() &c
             - time: strftime_l(), strptime_l()
           we also need at least
             - formatted IO: scanf_l(), printf_l() &c
             - time: strftime_l(), strptime_l()


@@ -246,7 +246,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale;
         { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); }
 
     #if wxUSE_UNICODE
         { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); }
 
     #if wxUSE_UNICODE

-    
+

         // ctype functions
         #define wxCRT_Isalnum_lW wxXLOCALE_IDENT(iswalnum_l)
         #define wxCRT_Isalpha_lW wxXLOCALE_IDENT(iswalpha_l)
         // ctype functions
         #define wxCRT_Isalnum_lW wxXLOCALE_IDENT(iswalnum_l)
         #define wxCRT_Isalpha_lW wxXLOCALE_IDENT(iswalpha_l)


@@ -329,7 +329,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale;
     unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc);
 
 #endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT
     unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc);
 
 #endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT

-    
+

 #endif // wxUSE_XLOCALE
 
 #endif // _WX_XLOCALE_H_
 #endif // wxUSE_XLOCALE
 
 #endif // _WX_XLOCALE_H_

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 1bd8f1c7f1c8ee300a0f42286f01ea957d425100..db2f2ef15b55ba3ec6b6ee7e6e9a0d9423aa061f 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -32,17 +32,17 @@ public:
     // Is the stream XPM file?
     // NOTE: this function modifies the current stream position
     bool CanRead(wxInputStream& stream);
     // Is the stream XPM file?
     // NOTE: this function modifies the current stream position
     bool CanRead(wxInputStream& stream);

-    
+

     // Read XPM file from the stream, parse it and create image from it
     wxImage ReadFile(wxInputStream& stream);
 #endif
 
     // Read directly from XPM data (as passed to wxBitmap ctor):
     wxImage ReadData(const char* const* xpm_data);
     // Read XPM file from the stream, parse it and create image from it
     wxImage ReadFile(wxInputStream& stream);
 #endif
 
     // Read directly from XPM data (as passed to wxBitmap ctor):
     wxImage ReadData(const char* const* xpm_data);

-    
+

 #ifdef __BORLANDC__
     // needed for Borland 5.5
 #ifdef __BORLANDC__
     // needed for Borland 5.5

-    wxImage ReadData(char** xpm_data) 
+    wxImage ReadData(char** xpm_data)

         { return ReadData(const_cast<const char* const*>(xpm_data)); }
 #endif
 };
         { return ReadData(const_cast<const char* const*>(xpm_data)); }
 #endif
 };

diff --git a/include/wx/xrc/xh_spin.h b/include/wx/xrc/xh_spin.h
index 1182a33f03d9d8592980bbd7f0b92e02d70af0eb..a6cf9fc27fd3cb379766b234e7fb8befd704b889 100644 (file)
--- a/include/wx/xrc/xh_spin.h
+++ b/include/wx/xrc/xh_spin.h
@@ -13,7 +13,7 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_XRC 
+#if wxUSE_XRC

 
 #if wxUSE_SPINBTN
 
 
 #if wxUSE_SPINBTN
 

diff --git a/include/wx/xti.h b/include/wx/xti.h
index c5b650f2b62f9e6ffef5b27384bc479ec170e2f6..45e474fa7c442fcebce3775cf322afe594673a20 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -2027,7 +2027,7 @@ private :
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) wxConstructorFor##name   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \
     (int) sizeof(name),                              \
     (wxObjectConstructorFn) wxConstructorFor##name   ,   \
     name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \

-    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);    
+    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);

 
 #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
     _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "", NULL) \
 
 #define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
     _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "", NULL) \

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index f9cb18352dd88d8aba7742b483f7b53e58ed7eb9..0d8462de1d27c5c58773af6ca99ef55682ffdeec 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -3446,7 +3446,7 @@ void wxAuiNotebook::SetSelectionToWindow(wxWindow *win)
     // to the child tab in the SetSelection call below
     // (the child focus event will also let wxAuiManager, if any,
     // know that the notebook control has been activated)
     // to the child tab in the SetSelection call below
     // (the child focus event will also let wxAuiManager, if any,
     // know that the notebook control has been activated)

-    
+

     wxWindow* parent = GetParent();
     if (parent)
     {
     wxWindow* parent = GetParent();
     if (parent)
     {

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 55b5e89258d496502b2d9561237db11822775b7e..52f2d418338568bf7f93954ddea3b51759360bf1 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -261,15 +261,15 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
 #else
     static unsigned char close_bits[]={
          // reduced height, symmetric
 #else
     static unsigned char close_bits[]={
          // reduced height, symmetric

-         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0x9f, 0xf9, 
-         0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xff, 0xff, 
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf3, 0x9f, 0xf9,
+         0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xff, 0xff,

          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
       /*
          // same height as maximize/restore
          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
       /*
          // same height as maximize/restore

-         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe7, 0xcf, 0xf3, 0x9f, 0xf9, 
-         0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xe7, 0xe7, 
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe7, 0xcf, 0xf3, 0x9f, 0xf9,
+         0x3f, 0xfc, 0x7f, 0xfe, 0x3f, 0xfc, 0x9f, 0xf9, 0xcf, 0xf3, 0xe7, 0xe7,

          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

-      */      
+      */

 #endif
 
     static unsigned char maximize_bits[] = {
 #endif
 
     static unsigned char maximize_bits[] = {

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 583f82847e38680220110e3f431d8c4ef47f7732..940ecfdad41ec2dab8806687ab1783e586c493ee 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -568,7 +568,7 @@ class wxAuiProportionalBoxSizer : public wxBoxSizer
 {
 public:
     wxAuiProportionalBoxSizer(int orientation) : wxBoxSizer(orientation) { }
 {
 public:
     wxAuiProportionalBoxSizer(int orientation) : wxBoxSizer(orientation) { }

-    
+

     void RecalcSizes()
     {
         if (m_children.GetCount() == 0)
     void RecalcSizes()
     {
         if (m_children.GetCount() == 0)


@@ -578,18 +578,18 @@ public:
         int fixed_width = 0;
         int stretchable = 0;
         wxSizerItemList::compatibility_iterator node;
         int fixed_width = 0;
         int stretchable = 0;
         wxSizerItemList::compatibility_iterator node;

-        
+

         // find fixed width and height, as well
         // as the total stretchable proportions
         node = m_children.GetFirst();
         while (node)
         {
             wxSizerItem *item = node->GetData();
         // find fixed width and height, as well
         // as the total stretchable proportions
         node = m_children.GetFirst();
         while (node)
         {
             wxSizerItem *item = node->GetData();

-            
+

             if (item->IsShown())
             {
                 stretchable += item->GetProportion();
             if (item->IsShown())
             {
                 stretchable += item->GetProportion();

-                
+

                 wxSize size(item->GetMinSizeWithBorder());
                 if (item->GetProportion() == 0)
                 {
                 wxSize size(item->GetMinSizeWithBorder());
                 if (item->GetProportion() == 0)
                 {


@@ -605,7 +605,7 @@ public:
                     }
                 }
             }
                     }
                 }
             }

-            
+

             node = node->GetNext();
         }
 
             node = node->GetNext();
         }
 


@@ -676,7 +676,7 @@ public:
                         child_pos.y += (m_size.y - size.y) / 2;
 
                     item->SetDimension(child_pos, child_size);
                         child_pos.y += (m_size.y - size.y) / 2;
 
                     item->SetDimension(child_pos, child_size);

-                    
+

                     pt.x += width;
                 }
             }
                     pt.x += width;
                 }
             }


@@ -4181,7 +4181,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event)
         int used_width = 0, used_height = 0;
 
         wxSize client_size = m_frame->GetClientSize();
         int used_width = 0, used_height = 0;
 
         wxSize client_size = m_frame->GetClientSize();

-        
+

         size_t dock_i, dock_count = m_docks.GetCount();
         for (dock_i = 0; dock_i < dock_count; ++dock_i)
         {
         size_t dock_i, dock_count = m_docks.GetCount();
         for (dock_i = 0; dock_i < dock_count; ++dock_i)
         {


@@ -4199,12 +4199,12 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event)
             if (dock.resizable)
                 used_width += sash_size;
         }
             if (dock.resizable)
                 used_width += sash_size;
         }

-        
-        
+
+

         int available_width = client_size.GetWidth() - used_width;
         int available_height = client_size.GetHeight() - used_height;
         int available_width = client_size.GetWidth() - used_width;
         int available_height = client_size.GetHeight() - used_height;

-        
-        
+
+

 #if wxUSE_STATUSBAR
         // if there's a status control, the available
         // height decreases accordingly
 #if wxUSE_STATUSBAR
         // if there's a status control, the available
         // height decreases accordingly


@@ -4219,13 +4219,13 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event)
             }
         }
 #endif
             }
         }
 #endif

-    
+

         wxRect& rect = m_action_part->dock->rect;
 
         wxPoint new_pos(event.m_x - m_action_offset.x,
             event.m_y - m_action_offset.y);
         int new_size, old_size = m_action_part->dock->size;
         wxRect& rect = m_action_part->dock->rect;
 
         wxPoint new_pos(event.m_x - m_action_offset.x,
             event.m_y - m_action_offset.y);
         int new_size, old_size = m_action_part->dock->size;

-        
+

         switch (m_action_part->dock->dock_direction)
         {
         case wxAUI_DOCK_LEFT:
         switch (m_action_part->dock->dock_direction)
         {
         case wxAUI_DOCK_LEFT:


@@ -4358,7 +4358,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event)
             m_action = actionNone;
             return false;
         }
             m_action = actionNone;
             return false;
         }

-        
+

         // calculate the new proportion of the pane
         int new_proportion = (new_pixsize*total_proportion)/dock_pixels;
 
         // calculate the new proportion of the pane
         int new_proportion = (new_pixsize*total_proportion)/dock_pixels;
 


@@ -4421,7 +4421,7 @@ bool wxAuiManager::DoEndResizeAction(wxMouseEvent& event)
             prop_borrow -= prop_diff;
         }
 
             prop_borrow -= prop_diff;
         }
 

-        
+

         dock.panes.Item(borrow_pane)->dock_proportion = prop_borrow;
         pane.dock_proportion = new_proportion;
 
         dock.panes.Item(borrow_pane)->dock_proportion = prop_borrow;
         pane.dock_proportion = new_proportion;
 


@@ -4568,7 +4568,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event)
                     DrawResizeHint(dc, m_action_hintrect);
                     m_action_hintrect = wxRect();
                 }
                     DrawResizeHint(dc, m_action_hintrect);
                     m_action_hintrect = wxRect();
                 }

-                
+

                 // draw new resize hint, if it's inside the managed frame
                 wxRect frame_screen_rect = m_frame->GetScreenRect();
                 if (frame_screen_rect.Contains(rect))
                 // draw new resize hint, if it's inside the managed frame
                 wxRect frame_screen_rect = m_frame->GetScreenRect();
                 if (frame_screen_rect.Contains(rect))

diff --git a/src/cocoa/data.cpp b/src/cocoa/data.cpp
index c2dac0b6ebde92d8f544f4a350d1da7a6749b4a1..6880f7295c8dc29fd16101d84a2d2eb7c8b55a60 100644 (file)
--- a/src/cocoa/data.cpp
+++ b/src/cocoa/data.cpp
@@ -6,6 +6,6 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index c4e34e7912f550e06eba21f19d72e1563dde822d..7cd6a7df431a9719ce8a5dd87706750bc4def856 100644 (file)
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -209,7 +209,7 @@ wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
 
                 if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
                 {
 
                 if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
                 {

-                    // the caller wants default size, which is larger than 
+                    // the caller wants default size, which is larger than

                     // the image we have; to avoid degrading it visually by
                     // scaling it up, paste it into transparent image instead:
                     wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
                     // the image we have; to avoid degrading it visually by
                     // scaling it up, paste it into transparent image instead:
                     wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);

diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 474a05899b9bb397d618e63429c8827387bad7a4..fbee7a236c172acd754703650960cc707efdbce4 100644 (file)
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -35,7 +35,7 @@ wxCairoLibrary *wxCairoLibrary::ms_lib = NULL;
 wxCairoLibrary::wxCairoLibrary()
 {
     wxLogNull log;
 wxCairoLibrary::wxCairoLibrary()
 {
     wxLogNull log;

-    
+

     m_libCairo.Load("libcairo.so.2");
     m_ok = m_libCairo.IsLoaded();
     if ( !m_ok )
     m_libCairo.Load("libcairo.so.2");
     m_ok = m_libCairo.IsLoaded();
     if ( !m_ok )


@@ -67,7 +67,7 @@ wxCairoLibrary::~wxCairoLibrary()
             ms_lib = NULL;
         }
     }
             ms_lib = NULL;
         }
     }

-    
+

     return ms_lib;
 }
 
     return ms_lib;
 }
 

diff --git a/src/common/config.cpp b/src/common/config.cpp
index c3a5e8b8cea252d3343e7c33907a8c6d9e734ac9..488aa3b118423480617b10992f0f7e5edebd85ef 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -393,7 +393,7 @@ wxString wxExpandEnvVars(const wxString& str)
 
           while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
             m++;
 
           while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
             m++;

- 
+

           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
 #ifdef __WXWINCE__
           wxString strVarName(str.c_str() + n + 1, m - n - 1);
 
 #ifdef __WXWINCE__

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index d668d66503c16a798a889935292d547853e9ed69..d0a197da1fe2f92cc62e7a0937822e88f3f9b45d 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -123,7 +123,7 @@ void wxItemContainer::Delete(unsigned int pos)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// 
+//

 // ----------------------------------------------------------------------------
 
 int wxItemContainer::DoInsertItemsInLoop(const wxArrayStringsAdapter& items,
 // ----------------------------------------------------------------------------
 
 int wxItemContainer::DoInsertItemsInLoop(const wxArrayStringsAdapter& items,

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 63244de2fe2cc8965a0ddb9a9bb278319162547b..66982abf7a2b18c8ad52a6fa3092e1f417e9735e 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -706,7 +706,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
     m_editorCtrl = CreateEditorCtrl( dv_ctrl->GetMainWindow(), labelRect, value );
 
 
     m_editorCtrl = CreateEditorCtrl( dv_ctrl->GetMainWindow(), labelRect, value );
 

-       // there might be no editor control for the given item
+    // there might be no editor control for the given item

     if(!m_editorCtrl)
         return false;
 
     if(!m_editorCtrl)
         return false;
 

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index df722ea5d90575058171ccf221bd851addc7afc4..8de2da6817da4b8ba1713040ae400e1e1321c63c 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -72,7 +72,7 @@ static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode
         case wxXOR:        // src XOR dst
             *op = wxCOMPOSITION_XOR;
             break;
         case wxXOR:        // src XOR dst
             *op = wxCOMPOSITION_XOR;
             break;

-            
+

         case wxAND:        // src AND dst
         case wxAND_INVERT: // (NOT src) AND dst
         case wxAND_REVERSE:// src AND (NOT dst)
         case wxAND:        // src AND dst
         case wxAND_INVERT: // (NOT src) AND dst
         case wxAND_REVERSE:// src AND (NOT dst)


@@ -451,7 +451,7 @@ void wxGCDCImpl::SetFont( const wxFont &font )
             f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
         m_graphicContext->SetFont( f, m_textForegroundColour );
 #if defined(__WXGTK__) || defined(__WXOSX__)
             f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
         m_graphicContext->SetFont( f, m_textForegroundColour );
 #if defined(__WXGTK__) || defined(__WXOSX__)

-        if ( m_font.IsOk() && m_font.GetNoAntiAliasing() ) 
+        if ( m_font.IsOk() && m_font.GetNoAntiAliasing() )

         {
             m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
         }
         {
             m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
         }


@@ -499,12 +499,12 @@ void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
         return;
 
     m_logicalFunction = function;
         return;
 
     m_logicalFunction = function;

-    
+

     wxCompositionMode mode;
     m_logicalFunctionSupported = TranslateRasterOp( function, &mode);
     if (m_logicalFunctionSupported)
         m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);
     wxCompositionMode mode;
     m_logicalFunctionSupported = TranslateRasterOp( function, &mode);
     if (m_logicalFunctionSupported)
         m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);

-        
+

     if (mode == wxCOMPOSITION_XOR)
         m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
     else
     if (mode == wxCOMPOSITION_XOR)
         m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
     else


@@ -512,7 +512,7 @@ void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
 }
 
 bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
 }
 
 bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),

-                             const wxColour& WXUNUSED(col), 
+                             const wxColour& WXUNUSED(col),

                              wxFloodFillStyle WXUNUSED(style))
 {
     return false;
                              wxFloodFillStyle WXUNUSED(style))
 {
     return false;


@@ -851,7 +851,7 @@ bool wxGCDCImpl::CanDrawBitmap() const
 
 bool wxGCDCImpl::DoBlit(
     wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 
 bool wxGCDCImpl::DoBlit(
     wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-    wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+    wxDC *source, wxCoord xsrc, wxCoord ysrc,

     wxRasterOperationMode logical_func , bool useMask,
     wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxRasterOperationMode logical_func , bool useMask,
     wxCoord xsrcMask, wxCoord ysrcMask )
 {


@@ -871,7 +871,7 @@ bool wxGCDCImpl::DoStretchBlit(
 
     if ( logical_func == wxNO_OP )
         return true;
 
     if ( logical_func == wxNO_OP )
         return true;

-        
+

     wxCompositionMode mode;
     if ( !TranslateRasterOp(logical_func, &mode) )
     {
     wxCompositionMode mode;
     if ( !TranslateRasterOp(logical_func, &mode) )
     {


@@ -880,7 +880,7 @@ bool wxGCDCImpl::DoStretchBlit(
     }
 
     bool retval = true;
     }
 
     bool retval = true;

-    
+

     wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
     if (m_graphicContext->SetCompositionMode(mode))
     {
     wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
     if (m_graphicContext->SetCompositionMode(mode))
     {


@@ -889,7 +889,7 @@ bool wxGCDCImpl::DoStretchBlit(
         {
             m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
         }
         {
             m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
         }

-            
+

         if (xsrcMask == -1 && ysrcMask == -1)
         {
             xsrcMask = xsrc;
         if (xsrcMask == -1 && ysrcMask == -1)
         {
             xsrcMask = xsrc;


@@ -926,7 +926,7 @@ bool wxGCDCImpl::DoStretchBlit(
             wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
             retval = false;
         }
             wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
             retval = false;
         }

-        
+

         if (mode == wxCOMPOSITION_XOR)
         {
             m_graphicContext->SetAntialiasMode(formerAa);
         if (mode == wxCOMPOSITION_XOR)
         {
             m_graphicContext->SetAntialiasMode(formerAa);

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index d152896a54b7a6444793c3159a1749a2c3c6f94f..8cae975656bccc879a1ee2b4927a91031fabdc50 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -465,7 +465,7 @@ void wxDialogBase::OnButton(wxCommandEvent& event)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// compatibility methods for supporting the modality API 
+// compatibility methods for supporting the modality API

 // ----------------------------------------------------------------------------
 
 wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
 // ----------------------------------------------------------------------------
 
 wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );


@@ -483,7 +483,7 @@ void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
 {
     wxCommandEvent event ( type, GetId());
     event.SetEventObject(this);
 {
     wxCommandEvent event ( type, GetId());
     event.SetEventObject(this);

-    
+

     if ( !GetEventHandler()->ProcessEvent(event) )
     {
         // the event is not propagated upwards to the parent automatically
     if ( !GetEventHandler()->ProcessEvent(event) )
     {
         // the event is not propagated upwards to the parent automatically


@@ -491,7 +491,7 @@ void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
         // in 9 cases of 10 the message must be processed by the dialog
         // owner and not the dialog itself
         (void)GetParent()->GetEventHandler()->ProcessEvent(event);
         // in 9 cases of 10 the message must be processed by the dialog
         // owner and not the dialog itself
         (void)GetParent()->GetEventHandler()->ProcessEvent(event);

-    }    
+    }

 }
 
 
 }
 
 

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index c9210559aa7c782e215adf7e54c249c775f5d1bc..0ca910ed08cdfc7f1265d720d612dea34cd4283d 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -121,7 +121,7 @@ bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
     // realLen = fileLen - numOfLinesInTheFile)
     length = fread(buf.data(), sizeof(char), length, m_fp);
 
     // realLen = fileLen - numOfLinesInTheFile)
     length = fread(buf.data(), sizeof(char), length, m_fp);
 

-    if ( Error() ) 
+    if ( Error() )

     {
         wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 
     {
         wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 

diff --git a/src/common/fileback.cpp b/src/common/fileback.cpp
index 6e4253c0f76896fa8684a6ecee8724c5a603e4a4..5544ee7b548393a65072dcdd657419f73190226a 100644 (file)
--- a/src/common/fileback.cpp
+++ b/src/common/fileback.cpp
@@ -293,7 +293,7 @@ wxFileOffset wxBackedInputStream::FindLength() const
 
     return len;
 }
 
     return len;
 }

-    
+

 size_t wxBackedInputStream::OnSysRead(void *buffer, size_t size)
 {
     if (!IsOk())
 size_t wxBackedInputStream::OnSysRead(void *buffer, size_t size)
 {
     if (!IsOk())

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 2ae9c2dfd3696bf86cbff9e15ad0bf501d9b8a96..1e3740864eb81db12d921843ada3c493e2477480 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -120,15 +120,15 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
             wxTheMimeTypesManager->AddFallbacks(fallbacks);
             s_MinimalMimeEnsured = true;
         }
             wxTheMimeTypesManager->AddFallbacks(fallbacks);
             s_MinimalMimeEnsured = true;
         }

-        
+

         wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
         if ( !ft || !ft -> GetMimeType(&mime) )
         {
             mime = wxEmptyString;
         }
         wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
         if ( !ft || !ft -> GetMimeType(&mime) )
         {
             mime = wxEmptyString;
         }

-        
+

         delete ft;
         delete ft;

-        
+

         return mime;
     }
     else
         return mime;
     }
     else

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 34cbea0d21fdd695d7eca428dc03cfd0dfbb0993..c7acc6c8503161dddfb176027abf20d77acd50a3 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -101,7 +101,7 @@ static wxFontEncoding gs_encodings[] =
     wxFONTENCODING_GB2312,
     wxFONTENCODING_ISO2022_JP,
 
     wxFONTENCODING_GB2312,
     wxFONTENCODING_ISO2022_JP,
 

-    wxFONTENCODING_MACROMAN, 
+    wxFONTENCODING_MACROMAN,

     wxFONTENCODING_MACJAPANESE,
     wxFONTENCODING_MACCHINESETRAD,
     wxFONTENCODING_MACKOREAN,
     wxFONTENCODING_MACJAPANESE,
     wxFONTENCODING_MACCHINESETRAD,
     wxFONTENCODING_MACKOREAN,


@@ -306,7 +306,7 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =
     { wxT( "GB2312" ), NULL },
     { wxT( "ISO-2022-JP" ), NULL },
 
     { wxT( "GB2312" ), NULL },
     { wxT( "ISO-2022-JP" ), NULL },
 

- 
+

     { wxT( "MacRoman" ), NULL },
     { wxT( "MacJapanese" ), NULL },
     { wxT( "MacChineseTrad" ), NULL },
     { wxT( "MacRoman" ), NULL },
     { wxT( "MacJapanese" ), NULL },
     { wxT( "MacChineseTrad" ), NULL },

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 4010d6b7bc6107bf5c21bef6e19d8edbc14679bc..0725335a581bb8c24c0675cd03b9a1cfa33dc177 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -214,7 +214,7 @@ void wxFontBase::SetPixelSize( const wxSize& pixelSize )
     // NOTE: this algorithm for adjusting the font size is used by all
     //       implementations of wxFont except under wxMSW and wxGTK where
     //       native support to font creation using pixel-size is provided.
     // NOTE: this algorithm for adjusting the font size is used by all
     //       implementations of wxFont except under wxMSW and wxGTK where
     //       native support to font creation using pixel-size is provided.

-    
+

     int largestGood = 0;
     int smallestBad = 0;
 
     int largestGood = 0;
     int smallestBad = 0;
 


@@ -804,7 +804,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
         token.Trim(true).Trim(false).MakeLower();
         if (insideQuotes)
         {
         token.Trim(true).Trim(false).MakeLower();
         if (insideQuotes)
         {

-            if (token.StartsWith("'") || 
+            if (token.StartsWith("'") ||

                 token.EndsWith("'"))
             {
                 insideQuotes = false;
                 token.EndsWith("'"))
             {
                 insideQuotes = false;


@@ -910,7 +910,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
                     family = wxFONTFAMILY_TELETYPE;
                 else
                     return false;
                     family = wxFONTFAMILY_TELETYPE;
                 else
                     return false;

-                
+

                 SetFamily(family);
             }
             // NB: the check on the facename is implemented in wxFontBase::SetFaceName
                 SetFamily(family);
             }
             // NB: the check on the facename is implemented in wxFontBase::SetFaceName

diff --git a/src/common/fontenumcmn.cpp b/src/common/fontenumcmn.cpp
index b5555007102d6928961fe3094237fa82f7928af4..bc2b96ce9df6196d1f25cd382531f8e7c8e4c498 100644 (file)
--- a/src/common/fontenumcmn.cpp
+++ b/src/common/fontenumcmn.cpp
@@ -84,9 +84,9 @@ bool wxFontEnumerator::IsValidFacename(const wxString &facename)
 
 #ifdef __WXMSW__
     // Quoting the MSDN:
 
 #ifdef __WXMSW__
     // Quoting the MSDN:

-    //     "MS Shell Dlg is a mapping mechanism that enables 
-    //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to 
-    //     support locales that have characters that are not contained in code 
+    //     "MS Shell Dlg is a mapping mechanism that enables
+    //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to
+    //     support locales that have characters that are not contained in code

     //     page 1252. It is not a font but a face name for a nonexistent font."
     // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid
     // font face names even if they are not enumerated by wxFontEnumerator
     //     page 1252. It is not a font but a face name for a nonexistent font."
     // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid
     // font face names even if they are not enumerated by wxFontEnumerator

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 2ed1f2e8658a13ab8077e11ee32c5a322021230e..9339de6720dd1b00820f42313474a428658c7805 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -152,7 +152,7 @@ class wxFileSystemInternetModule : public wxModule
             return true;
         }
 
             return true;
         }
 

-        virtual void OnExit() 
+        virtual void OnExit()

         {
             delete wxFileSystem::RemoveHandler(m_handler);
         }
         {
             delete wxFileSystem::RemoveHandler(m_handler);
         }

diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 7369b1b1453ddbe7935d59777ea3acb64ab7354a..66c27e82993ea419cbcfe30b6babb61ae412c504 100644 (file)
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -583,7 +583,7 @@ void wxGridBagSizer::RecalcSizes()
 void wxGridBagSizer::AdjustForOverflow()
 {
     int row, col;
 void wxGridBagSizer::AdjustForOverflow()
 {
     int row, col;

-    
+

     for (row=0; row<(int)m_rowHeights.GetCount(); row++)
     {
         int rowExtra=INT_MAX;
     for (row=0; row<(int)m_rowHeights.GetCount(); row++)
     {
         int rowExtra=INT_MAX;


@@ -597,7 +597,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);

-            
+

             // If the item starts in this position and doesn't span rows, then
             // just look at the whole item height
             if ( item->GetPos() == pos && endrow == row )
             // If the item starts in this position and doesn't span rows, then
             // just look at the whole item height
             if ( item->GetPos() == pos && endrow == row )


@@ -617,7 +617,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
                 if ( itemHeight < 0 )
                     itemHeight = 0;
 
                 if ( itemHeight < 0 )
                     itemHeight = 0;

-                
+

                 // and check how much is left
                 rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
             }
                 // and check how much is left
                 rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
             }


@@ -640,7 +640,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);
 
             int endrow, endcol;
             item->GetEndPos(endrow, endcol);

-            
+

             if ( item->GetPos() == pos && endcol == col )
             {
                 int itemWidth = item->CalcMin().GetWidth();
             if ( item->GetPos() == pos && endcol == col )
             {
                 int itemWidth = item->CalcMin().GetWidth();


@@ -656,7 +656,7 @@ void wxGridBagSizer::AdjustForOverflow()
 
                 if ( itemWidth < 0 )
                     itemWidth = 0;
 
                 if ( itemWidth < 0 )
                     itemWidth = 0;

-                
+

                 colExtra = wxMin(colExtra, colWidth - itemWidth);
             }
         }
                 colExtra = wxMin(colExtra, colWidth - itemWidth);
             }
         }


@@ -664,7 +664,7 @@ void wxGridBagSizer::AdjustForOverflow()
             m_colWidths[col] -= colExtra;
     }
 
             m_colWidths[col] -= colExtra;
     }
 

-    
+

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------

diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp
index e7dc25865cf6ca00664d53daf8b6b2219853eacc..675f512a4d26ed96b753ac6d291577e8cbec0434 100644 (file)
--- a/src/common/glcmn.cpp
+++ b/src/common/glcmn.cpp
@@ -62,7 +62,7 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
     return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
 }
 
     return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
 }
 

-#ifndef wxHAS_OPENGL_ES 
+#ifndef wxHAS_OPENGL_ES

 bool wxGLCanvasBase::SetColour(const wxString& colour)
 {
     wxColour col = wxTheColourDatabase->Find(colour);
 bool wxGLCanvasBase::SetColour(const wxString& colour)
 {
     wxColour col = wxTheColourDatabase->Find(colour);

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index aa286cc58aa65930109165a44085de70439f3c31..4c2f0879c6513399e690b16a4bbc86b9ec793e24 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -501,7 +501,7 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 

-wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : 
+wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) :

     wxGraphicsObject(renderer),
       m_antialias(wxANTIALIAS_DEFAULT),
       m_composition(wxCOMPOSITION_OVER)
     wxGraphicsObject(renderer),
       m_antialias(wxANTIALIAS_DEFAULT),
       m_composition(wxCOMPOSITION_OVER)

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index c50ddff713b9cc6952851402716a47f5b2c4ad70..3e7a128d101005f7a473af6a8fe8b66475bc28b8 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1320,7 +1320,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
 
     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
 
     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);

-    
+

     // nType is 1 for Icons, 2 for Cursors:
     wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
 
     // nType is 1 for Icons, 2 for Cursors:
     wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
 


@@ -1333,11 +1333,11 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
 
     // remember how many bytes we read from the stream:
     wxFileOffset alreadySeeked = sizeof(IconDir);
 
     // remember how many bytes we read from the stream:
     wxFileOffset alreadySeeked = sizeof(IconDir);

-    
+

     for (unsigned int i = 0; i < nIcons; i++ )
     {
         alreadySeeked += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead();
     for (unsigned int i = 0; i < nIcons; i++ )
     {
         alreadySeeked += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead();

-        
+

         // bHeight and bColorCount are wxUint8
         if ( pCurrentEntry->bWidth >= wMax )
         {
         // bHeight and bColorCount are wxUint8
         if ( pCurrentEntry->bWidth >= wMax )
         {


@@ -1351,7 +1351,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
                 colmax = pCurrentEntry->bColorCount;
             }
         }
                 colmax = pCurrentEntry->bColorCount;
             }
         }

-        
+

         pCurrentEntry++;
     }
 
         pCurrentEntry++;
     }
 


@@ -1371,13 +1371,13 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
     {
         // seek to selected icon:
         pCurrentEntry = pIconDirEntry + iSel;
     {
         // seek to selected icon:
         pCurrentEntry = pIconDirEntry + iSel;

-        
+

         // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
         //       load even non-seekable streams (see wxInputStream::SeekI docs)!
         wxFileOffset offset = wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - alreadySeeked;
         if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset)
             return false;
         // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
         //       load even non-seekable streams (see wxInputStream::SeekI docs)!
         wxFileOffset offset = wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - alreadySeeked;
         if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset)
             return false;

-        
+

         bResult = LoadDib(image, stream, true, IsBmp);
         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )
         bResult = LoadDib(image, stream, true, IsBmp);
         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )


@@ -1387,9 +1387,9 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
             image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
         }
     }
             image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
         }
     }

-    
+

     delete [] pIconDirEntry;
     delete [] pIconDirEntry;

-    
+

     return bResult;
 }
 
     return bResult;
 }
 


@@ -1400,7 +1400,7 @@ int wxICOHandler::DoGetImageCount(wxInputStream& stream)
     if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
              // it's ok to modify the stream position here
         return 0;
     if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
              // it's ok to modify the stream position here
         return 0;

-    
+

     return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount);
 }
 
     return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount);
 }
 

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 5ae109c97a434569f08f8f8b7b577a040dcf534b..70fe52e7076c5fc92c08cd35356578be630176cd 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -2698,7 +2698,7 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 {
     // NOTE: this code is the same of wxAnimationDecoder::CanRead and
     //       wxImageHandler::GetImageCount
 {
     // NOTE: this code is the same of wxAnimationDecoder::CanRead and
     //       wxImageHandler::GetImageCount

-    
+

     if ( !stream.IsSeekable() )
         return false;        // can't test unseekable stream
 
     if ( !stream.IsSeekable() )
         return false;        // can't test unseekable stream
 

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 7c7ef7c8e37dc19f42c1fc1f182b06f1d076bb28..fdb9a4971d1af78c4521d8d47c9fe2bb64c1d961 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -109,7 +109,7 @@ int wxGIFHandler::DoGetImageCount( wxInputStream& stream )
     wxGIFErrorCode error = decod.LoadGIF(stream);
     if ( (error != wxGIF_OK) && (error != wxGIF_TRUNCATED) )
         return -1;
     wxGIFErrorCode error = decod.LoadGIF(stream);
     if ( (error != wxGIF_OK) && (error != wxGIF_TRUNCATED) )
         return -1;

-    
+

     // NOTE: this function modifies the current stream position but it's ok
     //       (see wxImageHandler::GetImageCount)
 
     // NOTE: this function modifies the current stream position but it's ok
     //       (see wxImageHandler::GetImageCount)
 

diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index 3dd0f7f392bcbc4b8701bb627c0fad48c0e29676..428219853cf1198331ebca4791dade014a025795 100644 (file)
--- a/src/common/imagiff.cpp
+++ b/src/common/imagiff.cpp
@@ -98,10 +98,10 @@ public:
     // constructor, destructor, etc.
     wxIFFDecoder(wxInputStream *s);
     ~wxIFFDecoder() { Destroy(); }
     // constructor, destructor, etc.
     wxIFFDecoder(wxInputStream *s);
     ~wxIFFDecoder() { Destroy(); }

-    
+

     // NOTE: this function modifies the current stream position
     bool CanRead();
     // NOTE: this function modifies the current stream position
     bool CanRead();

-    
+

     int ReadIFF();
     bool ConvertToImage(wxImage *image) const;
 };
     int ReadIFF();
     bool ConvertToImage(wxImage *image) const;
 };

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 3dbadbe1cfd11d874827058386f4ed0a02247582..1f3ed86da6fde5051d627921559ce8d042dd636d 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -28,7 +28,7 @@
 
 // A hack based on one from tif_jpeg.c to overcome the problem on Windows
 // of rpcndr.h defining boolean with a different type to the jpeg headers.
 
 // A hack based on one from tif_jpeg.c to overcome the problem on Windows
 // of rpcndr.h defining boolean with a different type to the jpeg headers.

-// 
+//

 // This hack is only necessary for an external jpeg library, the builtin one
 // usually used on Windows doesn't use the type boolean, so always works.
 //
 // This hack is only necessary for an external jpeg library, the builtin one
 // usually used on Windows doesn't use the type boolean, so always works.
 //

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 68bfd86c0f6b91849ac13c5a1e08a5dccf7b79a8..0e90db2a5f0a7d9a53385376b46cfa0dedb45d92 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -448,7 +448,7 @@ int wxTIFFHandler::DoGetImageCount( wxInputStream& stream )
     } while (TIFFReadDirectory(tif));
 
     TIFFClose( tif );
     } while (TIFFReadDirectory(tif));
 
     TIFFClose( tif );

-    
+

     // NOTE: this function modifies the current stream position but it's ok
     //       (see wxImageHandler::GetImageCount)
 
     // NOTE: this function modifies the current stream position but it's ok
     //       (see wxImageHandler::GetImageCount)
 

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index e031315b21d550806e4c21ce9c95e56656ffcb8e..ff680307afab4cf01e3c77e45b662991b80e22b8 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -2614,8 +2614,8 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
 
     char chLast = '\0';
     size_t lastCount = 0;
 
     char chLast = '\0';
     size_t lastCount = 0;

-    
-    const char* formatchars = 
+
+    const char* formatchars =

         "dghHmMsSy"
 #ifdef __WXMSW__
         "t"
         "dghHmMsSy"
 #ifdef __WXMSW__
         "t"


@@ -2811,7 +2811,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
                     // strftime() doesn't have era string,
                     // ignore this format
                     wxASSERT_MSG( lastCount <= 2, "too many 'g's" );
                     // strftime() doesn't have era string,
                     // ignore this format
                     wxASSERT_MSG( lastCount <= 2, "too many 'g's" );

-         
+

                     break;
 #ifndef __WXMSW__
                 case 'a':
                     break;
 #ifndef __WXMSW__
                 case 'a':

diff --git a/src/common/log.cpp b/src/common/log.cpp
index da627fec24e600457254e9747375766457419b91..6731ccb9d23757a546e95e2af28a5cbfbe621ce7 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -109,7 +109,7 @@ WX_DEFINE_LOG_CS(BackgroundLog);
 // this one is used for protecting ms_aTraceMasks from concurrent access
 WX_DEFINE_LOG_CS(TraceMask);
 
 // this one is used for protecting ms_aTraceMasks from concurrent access
 WX_DEFINE_LOG_CS(TraceMask);
 

-// and this one is used for GetComponentLevels() 
+// and this one is used for GetComponentLevels()

 WX_DEFINE_LOG_CS(Levels);
 
 } // anonymous namespace
 WX_DEFINE_LOG_CS(Levels);
 
 } // anonymous namespace

diff --git a/src/common/persist.cpp b/src/common/persist.cpp
index 64b5957c7cd4fe89863dce0ae1a3f210e3d904db..7f8898f3274c98e119621dc8d5ef61727bbfd075 100644 (file)
--- a/src/common/persist.cpp
+++ b/src/common/persist.cpp
@@ -152,6 +152,6 @@ wxPERSIST_DEFINE_SAVE_RESTORE_FOR(int)
 wxPERSIST_DEFINE_SAVE_RESTORE_FOR(long)
 wxPERSIST_DEFINE_SAVE_RESTORE_FOR(wxString)
 
 wxPERSIST_DEFINE_SAVE_RESTORE_FOR(long)
 wxPERSIST_DEFINE_SAVE_RESTORE_FOR(wxString)
 

-#undef wxPERSIST_DEFINE_SAVE_RESTORE_FOR  
+#undef wxPERSIST_DEFINE_SAVE_RESTORE_FOR

 
 #endif // wxUSE_CONFIG
 
 #endif // wxUSE_CONFIG

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index ec7d0a2cee57bf46573b55ce520dbbb901f90bdb..1d3dbbc30d1a1d4a128ecbfe3df9a20297440be2 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -66,13 +66,13 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;

-    
+

     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;
     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;

-        
+

     SetMinSize( size );
     SetMinSize( size );

-        
+

     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))
     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))


@@ -113,7 +113,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -124,7 +124,7 @@ void wxPickerBase::PostCreation()
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);

-    
+

     SetInitialSize( GetMinSize() );
 }
 
     SetInitialSize( GetMinSize() );
 }
 

diff --git a/src/common/platinfo.cpp b/src/common/platinfo.cpp
index a1baeb101731475bdd36be2f3cf3a1bf775debdc..aab51c2298a839b58e0c743dc2b79b68472e6abe 100644 (file)
--- a/src/common/platinfo.cpp
+++ b/src/common/platinfo.cpp
@@ -192,7 +192,7 @@ void wxPlatformInfo::InitForCurrentPlatform()
     m_osDesc = wxGetOsDescription();
     m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
     m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;
     m_osDesc = wxGetOsDescription();
     m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
     m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;

-    
+

 #ifdef __LINUX__
     m_ldi = wxGetLinuxDistributionInfo();
 #endif
 #ifdef __LINUX__
     m_ldi = wxGetLinuxDistributionInfo();
 #endif

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 8ab0c0d00278b5d25af04a7f3ec1315af602717c..05d4d729a1b6d171ff9f736648dbae7cedf0cfd2 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -587,7 +587,7 @@ void wxPrintout::FitThisSizeToPaper(const wxSize& imageSize)
     float scaleX = ((float(paperRect.width) * w) / (float(pw) * imageSize.x));
     float scaleY = ((float(paperRect.height) * h) / (float(ph) * imageSize.y));
     float actualScale = wxMin(scaleX, scaleY);
     float scaleX = ((float(paperRect.width) * w) / (float(pw) * imageSize.x));
     float scaleY = ((float(paperRect.height) * h) / (float(ph) * imageSize.y));
     float actualScale = wxMin(scaleX, scaleY);

-    m_printoutDC->SetUserScale(actualScale, actualScale); 
+    m_printoutDC->SetUserScale(actualScale, actualScale);

     m_printoutDC->SetDeviceOrigin(0, 0);
     wxRect logicalPaperRect = GetLogicalPaperRect();
     SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y);
     m_printoutDC->SetDeviceOrigin(0, 0);
     wxRect logicalPaperRect = GetLogicalPaperRect();
     SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y);


@@ -604,7 +604,7 @@ void wxPrintout::FitThisSizeToPage(const wxSize& imageSize)
     float scaleX = float(w) / imageSize.x;
     float scaleY = float(h) / imageSize.y;
     float actualScale = wxMin(scaleX, scaleY);
     float scaleX = float(w) / imageSize.x;
     float scaleY = float(h) / imageSize.y;
     float actualScale = wxMin(scaleX, scaleY);

-    m_printoutDC->SetUserScale(actualScale, actualScale); 
+    m_printoutDC->SetUserScale(actualScale, actualScale);

     m_printoutDC->SetDeviceOrigin(0, 0);
 }
 
     m_printoutDC->SetDeviceOrigin(0, 0);
 }
 


@@ -632,7 +632,7 @@ void wxPrintout::FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageS
     float scaleX = (float(pageMarginsRect.width) * w) / (float(pw) * imageSize.x);
     float scaleY = (float(pageMarginsRect.height) * h) / (float(ph) * imageSize.y);
     float actualScale = wxMin(scaleX, scaleY);
     float scaleX = (float(pageMarginsRect.width) * w) / (float(pw) * imageSize.x);
     float scaleY = (float(pageMarginsRect.height) * h) / (float(ph) * imageSize.y);
     float actualScale = wxMin(scaleX, scaleY);

-    m_printoutDC->SetUserScale(actualScale, actualScale); 
+    m_printoutDC->SetUserScale(actualScale, actualScale);

     m_printoutDC->SetDeviceOrigin(0, 0);
     wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData);
     SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y);
     m_printoutDC->SetDeviceOrigin(0, 0);
     wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData);
     SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y);


@@ -655,16 +655,16 @@ void wxPrintout::MapScreenSizeToPage()
     // Set the DC scale and origin so that an image on the screen is the same
     // size on the paper and the origin is at the top left of the printable area.
     if (!m_printoutDC) return;
     // Set the DC scale and origin so that an image on the screen is the same
     // size on the paper and the origin is at the top left of the printable area.
     if (!m_printoutDC) return;

-    int ppiScreenX, ppiScreenY; 
-    GetPPIScreen(&ppiScreenX, &ppiScreenY); 
-    int ppiPrinterX, ppiPrinterY; 
-    GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); 
-    int w, h; 
-    m_printoutDC->GetSize(&w, &h); 
-    int pageSizePixelsX, pageSizePixelsY; 
-    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); 
-    float userScaleX = (float(ppiPrinterX) * w) / (float(ppiScreenX) * pageSizePixelsX); 
-    float userScaleY = (float(ppiPrinterY) * h) / (float(ppiScreenY) * pageSizePixelsY); 
+    int ppiScreenX, ppiScreenY;
+    GetPPIScreen(&ppiScreenX, &ppiScreenY);
+    int ppiPrinterX, ppiPrinterY;
+    GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
+    int w, h;
+    m_printoutDC->GetSize(&w, &h);
+    int pageSizePixelsX, pageSizePixelsY;
+    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY);
+    float userScaleX = (float(ppiPrinterX) * w) / (float(ppiScreenX) * pageSizePixelsX);
+    float userScaleY = (float(ppiPrinterY) * h) / (float(ppiScreenY) * pageSizePixelsY);

     m_printoutDC->SetUserScale(userScaleX, userScaleY);
     m_printoutDC->SetDeviceOrigin(0, 0);
 }
     m_printoutDC->SetUserScale(userScaleX, userScaleY);
     m_printoutDC->SetDeviceOrigin(0, 0);
 }


@@ -685,12 +685,12 @@ void wxPrintout::MapScreenSizeToDevice()
     // Set the DC scale so that a screen pixel is the same size as a device
     // pixel and the origin is at the top left of the printable area.
     if (!m_printoutDC) return;
     // Set the DC scale so that a screen pixel is the same size as a device
     // pixel and the origin is at the top left of the printable area.
     if (!m_printoutDC) return;

-    int w, h; 
-    m_printoutDC->GetSize(&w, &h); 
-    int pageSizePixelsX, pageSizePixelsY; 
-    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); 
-    float userScaleX = float(w) / pageSizePixelsX; 
-    float userScaleY = float(h) / pageSizePixelsY; 
+    int w, h;
+    m_printoutDC->GetSize(&w, &h);
+    int pageSizePixelsX, pageSizePixelsY;
+    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY);
+    float userScaleX = float(w) / pageSizePixelsX;
+    float userScaleY = float(h) / pageSizePixelsY;

     m_printoutDC->SetUserScale(userScaleX, userScaleY);
     m_printoutDC->SetDeviceOrigin(0, 0);
 }
     m_printoutDC->SetUserScale(userScaleX, userScaleY);
     m_printoutDC->SetDeviceOrigin(0, 0);
 }


@@ -706,17 +706,17 @@ wxRect wxPrintout::GetLogicalPaperRect() const
     m_printoutDC->GetSize(&w, &h);
     if (w == pw && h == ph) {
         // this DC matches the printed page, so no scaling
     m_printoutDC->GetSize(&w, &h);
     if (w == pw && h == ph) {
         // this DC matches the printed page, so no scaling

-        return wxRect(m_printoutDC->DeviceToLogicalX(paperRect.x), 
-            m_printoutDC->DeviceToLogicalY(paperRect.y), 
-            m_printoutDC->DeviceToLogicalXRel(paperRect.width), 
+        return wxRect(m_printoutDC->DeviceToLogicalX(paperRect.x),
+            m_printoutDC->DeviceToLogicalY(paperRect.y),
+            m_printoutDC->DeviceToLogicalXRel(paperRect.width),

             m_printoutDC->DeviceToLogicalYRel(paperRect.height));
     }
     // This DC doesn't match the printed page, so we have to scale.
     float scaleX = float(w) / pw;
     float scaleY = float(h) / ph;
             m_printoutDC->DeviceToLogicalYRel(paperRect.height));
     }
     // This DC doesn't match the printed page, so we have to scale.
     float scaleX = float(w) / pw;
     float scaleY = float(h) / ph;

-    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(paperRect.x * scaleX)), 
-        m_printoutDC->DeviceToLogicalY(wxRound(paperRect.y * scaleY)), 
-        m_printoutDC->DeviceToLogicalXRel(wxRound(paperRect.width * scaleX)), 
+    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(paperRect.x * scaleX)),
+        m_printoutDC->DeviceToLogicalY(wxRound(paperRect.y * scaleY)),
+        m_printoutDC->DeviceToLogicalXRel(wxRound(paperRect.width * scaleX)),

         m_printoutDC->DeviceToLogicalYRel(wxRound(paperRect.height * scaleY)));
 }
 
         m_printoutDC->DeviceToLogicalYRel(wxRound(paperRect.height * scaleY)));
 }
 


@@ -726,9 +726,9 @@ wxRect wxPrintout::GetLogicalPageRect() const
     // area.
     int w, h;
     m_printoutDC->GetSize(&w, &h);
     // area.
     int w, h;
     m_printoutDC->GetSize(&w, &h);

-    return wxRect(m_printoutDC->DeviceToLogicalX(0), 
-        m_printoutDC->DeviceToLogicalY(0), 
-        m_printoutDC->DeviceToLogicalXRel(w), 
+    return wxRect(m_printoutDC->DeviceToLogicalX(0),
+        m_printoutDC->DeviceToLogicalY(0),
+        m_printoutDC->DeviceToLogicalXRel(w),

         m_printoutDC->DeviceToLogicalYRel(h));
 }
 
         m_printoutDC->DeviceToLogicalYRel(h));
 }
 


@@ -737,7 +737,7 @@ wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSe
     // Return the rectangle in logical units that corresponds to the region
     // within the page margins as specified by the given wxPageSetupDialogData
     // object.
     // Return the rectangle in logical units that corresponds to the region
     // within the page margins as specified by the given wxPageSetupDialogData
     // object.

-    
+

     // We get the paper size in device units and the margins in mm,
     // so we need to calculate the conversion with this trick
     wxCoord pw, ph;
     // We get the paper size in device units and the margins in mm,
     // so we need to calculate the conversion with this trick
     wxCoord pw, ph;


@@ -747,38 +747,38 @@ wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSe
     float mmToDeviceX = float(pw) / mw;
     float mmToDeviceY = float(ph) / mh;
 
     float mmToDeviceX = float(pw) / mw;
     float mmToDeviceY = float(ph) / mh;
 

-    // paper size in device units    
+    // paper size in device units

     wxRect paperRect = GetPaperRectPixels();
     wxRect paperRect = GetPaperRectPixels();

-    
+

     // margins in mm
     wxPoint topLeft = pageSetupData.GetMarginTopLeft();
     wxPoint bottomRight = pageSetupData.GetMarginBottomRight();
     // margins in mm
     wxPoint topLeft = pageSetupData.GetMarginTopLeft();
     wxPoint bottomRight = pageSetupData.GetMarginBottomRight();

-    
+

     // calculate margins in device units
     wxRect pageMarginsRect(
         paperRect.x      + wxRound(mmToDeviceX * topLeft.x),
         paperRect.y      + wxRound(mmToDeviceY * topLeft.y),
         paperRect.width  - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
         paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y)));
     // calculate margins in device units
     wxRect pageMarginsRect(
         paperRect.x      + wxRound(mmToDeviceX * topLeft.x),
         paperRect.y      + wxRound(mmToDeviceY * topLeft.y),
         paperRect.width  - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
         paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y)));

-        
+

     wxCoord w, h;
     m_printoutDC->GetSize(&w, &h);
     wxCoord w, h;
     m_printoutDC->GetSize(&w, &h);

-    if (w == pw && h == ph) 
+    if (w == pw && h == ph)

     {
         // this DC matches the printed page, so no scaling
         return wxRect(
     {
         // this DC matches the printed page, so no scaling
         return wxRect(

-            m_printoutDC->DeviceToLogicalX(pageMarginsRect.x), 
-            m_printoutDC->DeviceToLogicalY(pageMarginsRect.y), 
-            m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width), 
+            m_printoutDC->DeviceToLogicalX(pageMarginsRect.x),
+            m_printoutDC->DeviceToLogicalY(pageMarginsRect.y),
+            m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width),

             m_printoutDC->DeviceToLogicalYRel(pageMarginsRect.height));
     }
             m_printoutDC->DeviceToLogicalYRel(pageMarginsRect.height));
     }

-    
+

     // This DC doesn't match the printed page, so we have to scale.
     float scaleX = float(w) / pw;
     float scaleY = float(h) / ph;
     // This DC doesn't match the printed page, so we have to scale.
     float scaleX = float(w) / pw;
     float scaleY = float(h) / ph;

-    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(pageMarginsRect.x * scaleX)), 
-        m_printoutDC->DeviceToLogicalY(wxRound(pageMarginsRect.y * scaleY)), 
-        m_printoutDC->DeviceToLogicalXRel(wxRound(pageMarginsRect.width * scaleX)), 
+    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(pageMarginsRect.x * scaleX)),
+        m_printoutDC->DeviceToLogicalY(wxRound(pageMarginsRect.y * scaleY)),
+        m_printoutDC->DeviceToLogicalXRel(wxRound(pageMarginsRect.width * scaleX)),

         m_printoutDC->DeviceToLogicalYRel(wxRound(pageMarginsRect.height * scaleY)));
 }
 
         m_printoutDC->DeviceToLogicalYRel(wxRound(pageMarginsRect.height * scaleY)));
 }
 


@@ -786,19 +786,19 @@ void wxPrintout::SetLogicalOrigin(wxCoord x, wxCoord y)
 {
     // Set the device origin by specifying a point in logical coordinates.
     m_printoutDC->SetDeviceOrigin(
 {
     // Set the device origin by specifying a point in logical coordinates.
     m_printoutDC->SetDeviceOrigin(

-        m_printoutDC->LogicalToDeviceX(x), 
+        m_printoutDC->LogicalToDeviceX(x),

         m_printoutDC->LogicalToDeviceY(y) );
 }
         m_printoutDC->LogicalToDeviceY(y) );
 }

-    
+

 void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff)
 {
     // Offset the device origin by a specified distance in device coordinates.
     wxPoint dev_org = m_printoutDC->GetDeviceOrigin();
     m_printoutDC->SetDeviceOrigin(
 void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff)
 {
     // Offset the device origin by a specified distance in device coordinates.
     wxPoint dev_org = m_printoutDC->GetDeviceOrigin();
     m_printoutDC->SetDeviceOrigin(

-        dev_org.x + m_printoutDC->LogicalToDeviceXRel(xoff), 
+        dev_org.x + m_printoutDC->LogicalToDeviceXRel(xoff),

         dev_org.y + m_printoutDC->LogicalToDeviceYRel(yoff) );
 }
         dev_org.y + m_printoutDC->LogicalToDeviceYRel(yoff) );
 }

-    
+

 
 //----------------------------------------------------------------------------
 // wxPreviewCanvas
 
 //----------------------------------------------------------------------------
 // wxPreviewCanvas


@@ -1512,7 +1512,7 @@ bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
     wxMemoryDC temp_dc;
     temp_dc.SelectObject(*m_previewBitmap);
 
     wxMemoryDC temp_dc;
     temp_dc.SelectObject(*m_previewBitmap);
 

-    dc.Blit(pageRect.x, pageRect.y, 
+    dc.Blit(pageRect.x, pageRect.y,

         m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
 
     temp_dc.SelectObject(wxNullBitmap);
         m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
 
     temp_dc.SelectObject(wxNullBitmap);


@@ -1643,7 +1643,7 @@ bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
     // Draw blank page allowing for 1-pixel border AROUND the actual paper
     dc.SetPen(*wxBLACK_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);
     // Draw blank page allowing for 1-pixel border AROUND the actual paper
     dc.SetPen(*wxBLACK_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);

-    dc.DrawRectangle(paperRect.x - 2, paperRect.y - 1, 
+    dc.DrawRectangle(paperRect.x - 2, paperRect.y - 1,

         paperRect.width + 3, paperRect.height + 2);
 
     return true;
         paperRect.width + 3, paperRect.height + 2);
 
     return true;

diff --git a/src/common/process.cpp b/src/common/process.cpp
index ec9686c965bca3118912d95e1599fac632bbc787..db5eb5efad902cb4951e3ed748d089e1192bbf40 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -104,7 +104,7 @@ void wxProcess::Detach()
 {
     // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor)
     // not also from the previous handler like wxEvtHandler::Unlink() would do:
 {
     // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor)
     // not also from the previous handler like wxEvtHandler::Unlink() would do:

-    
+

     if (m_nextHandler)
         m_nextHandler->SetPreviousHandler(m_previousHandler);
 
     if (m_nextHandler)
         m_nextHandler->SetPreviousHandler(m_previousHandler);
 

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index f97d0727bc7f286a02d3114ea938c7c7b4abad48..f81154d5100725f6b7332cbfbdfade83a7684a02 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -520,7 +520,7 @@ int wxRegExImpl::Replace(wxString *text,
                     textstr + matchStart,
 #else
                     textstr.data() + matchStart,
                     textstr + matchStart,
 #else
                     textstr.data() + matchStart,

-#endif 
+#endif

                     countRepl ? wxRE_NOTBOL : 0
                     WXREGEX_IF_NEED_LEN(textlen - matchStart)) )
     {
                     countRepl ? wxRE_NOTBOL : 0
                     WXREGEX_IF_NEED_LEN(textlen - matchStart)) )
     {


@@ -566,13 +566,14 @@ int wxRegExImpl::Replace(wxString *text,
                     }
                     else
                     {
                     }
                     else
                     {

+                        textNew += wxString(

 #ifndef WXREGEX_CONVERT_TO_MB
 #ifndef WXREGEX_CONVERT_TO_MB

-                        textNew += wxString(textstr + matchStart + start,
+                                textstr

 #else
 #else

-                        textNew += wxString(textstr.data() + matchStart +
-                                           start,
+                                textstr.data()

 #endif
 #endif

-                                            *wxConvCurrent, len);
+                                + matchStart + start,
+                                *wxConvCurrent, len);

 
                         mayHaveBackrefs = true;
                     }
 
                         mayHaveBackrefs = true;
                     }


@@ -601,8 +602,7 @@ int wxRegExImpl::Replace(wxString *text,
 #ifndef WXREGEX_CONVERT_TO_MB
         result.append(*text, matchStart, start);
 #else
 #ifndef WXREGEX_CONVERT_TO_MB
         result.append(*text, matchStart, start);
 #else

-        result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, 
-                              start));
+        result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, start));

 #endif
         matchStart += start;
         result.append(textNew);
 #endif
         matchStart += start;
         result.append(textNew);

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 3d94c8bce844a12d93ed9b71649cfa25b1280b97..31ca5342f58865010f61fac22e09fbe687ca438e 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2198,12 +2198,12 @@ void wxStaticBoxSizer::RecalcSizes()
 #if defined( __WXGTK20__ )
         // if the wxStaticBox has created a wxPizza to contain its children
         // (see wxStaticBox::AddChild) then we need to place the items it contains
 #if defined( __WXGTK20__ )
         // if the wxStaticBox has created a wxPizza to contain its children
         // (see wxStaticBox::AddChild) then we need to place the items it contains

-        // in the wxBoxSizer::RecalcSizes() call below using coordinates relative 
+        // in the wxBoxSizer::RecalcSizes() call below using coordinates relative

         // to the top-left corner of the staticbox:
         m_position.x = m_position.y = 0;
 #else
         // if the wxStaticBox has childrens, then these windows must be placed
         // to the top-left corner of the staticbox:
         m_position.x = m_position.y = 0;
 #else
         // if the wxStaticBox has childrens, then these windows must be placed

-        // by the wxBoxSizer::RecalcSizes() call below using coordinates relative 
+        // by the wxBoxSizer::RecalcSizes() call below using coordinates relative

         // to the top-left corner of the staticbox (but unlike wxGTK, we need
         // to keep in count the static borders here!):
         m_position.x = other_border;
         // to the top-left corner of the staticbox (but unlike wxGTK, we need
         // to keep in count the static borders here!):
         m_position.x = other_border;

diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 24e09f1be394b4983735acec310e04dd7c87295a..80091ed14303a8f312bb45ff3cf2d289f285cd23 100644 (file)
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -37,7 +37,7 @@
 // ----------------------------------------------------------------------------
 
 // TODO:  Do we want to include the null char in the stream?  If so then
 // ----------------------------------------------------------------------------
 
 // TODO:  Do we want to include the null char in the stream?  If so then

-// just add +1 to m_len in the ctor 
+// just add +1 to m_len in the ctor

 wxStringInputStream::wxStringInputStream(const wxString& s)
 #if wxUSE_UNICODE
     // FIXME-UTF8: use wxCharBufferWithLength if we have it
 wxStringInputStream::wxStringInputStream(const wxString& s)
 #if wxUSE_UNICODE
     // FIXME-UTF8: use wxCharBufferWithLength if we have it


@@ -56,9 +56,9 @@ wxStringInputStream::wxStringInputStream(const wxString& s)
 // getlength
 // ----------------------------------------------------------------------------
 
 // getlength
 // ----------------------------------------------------------------------------
 

-wxFileOffset wxStringInputStream::GetLength() const 
-{ 
-    return m_len; 
+wxFileOffset wxStringInputStream::GetLength() const
+{
+    return m_len;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index a3142a2843e2a600da70f9b8c4e37e4f19e3e483..241d1c07b25a4b2e8f9853bdebd17e13a3eb72f0 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -943,17 +943,17 @@ wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
             bytes_read = Read(buf, WXSIZEOF(buf)).LastRead();
             if ( m_lasterror != wxSTREAM_NO_ERROR )
                 return wxInvalidOffset;
             bytes_read = Read(buf, WXSIZEOF(buf)).LastRead();
             if ( m_lasterror != wxSTREAM_NO_ERROR )
                 return wxInvalidOffset;

-            
+

             wxASSERT(bytes_read == WXSIZEOF(buf));
         }
             wxASSERT(bytes_read == WXSIZEOF(buf));
         }

-        
+

         // read the last 'pos' bytes
         bytes_read = Read(buf, (size_t)pos).LastRead();
         if ( m_lasterror != wxSTREAM_NO_ERROR )
             return wxInvalidOffset;
         // read the last 'pos' bytes
         bytes_read = Read(buf, (size_t)pos).LastRead();
         if ( m_lasterror != wxSTREAM_NO_ERROR )
             return wxInvalidOffset;

-        
+

         wxASSERT(bytes_read == (size_t)pos);
         wxASSERT(bytes_read == (size_t)pos);

-        
+

         // we should now have seeked to the right position...
         return TellI();
     }
         // we should now have seeked to the right position...
         return TellI();
     }

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 3da37a3a83c3dedb82476f5e05ac2c16aa56848a..b1c8838981a2473b4cfcd3fdcc6f5ef71cc5fed2 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1455,7 +1455,7 @@ protected:
 
 bool wxVariantDataLongLong::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataLongLong::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == wxS("longlong")), 
+    wxASSERT_MSG( (data.GetType() == wxS("longlong")),

                   "wxVariantDataLongLong::Eq: argument mismatch" );
 
     wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data;
                   "wxVariantDataLongLong::Eq: argument mismatch" );
 
     wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data;


@@ -1616,7 +1616,7 @@ protected:
 
 bool wxVariantDataULongLong::Eq(wxVariantData& data) const
 {
 
 bool wxVariantDataULongLong::Eq(wxVariantData& data) const
 {

-    wxASSERT_MSG( (data.GetType() == wxS("ulonglong")), 
+    wxASSERT_MSG( (data.GetType() == wxS("ulonglong")),

                   "wxVariantDataULongLong::Eq: argument mismatch" );
 
     wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data;
                   "wxVariantDataULongLong::Eq: argument mismatch" );
 
     wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data;

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 0362f8f28e59283720db19a705ca692d87713603..05909433d299a602858e6722bd99c832f3fb8f75 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -65,9 +65,9 @@ using namespace std ;
 #endif
 
 #if defined(__DARWIN__)
 #endif
 
 #if defined(__DARWIN__)

-       #include "wx/osx/core/cfref.h"
-       #include <CoreFoundation/CFLocale.h>
-       #include "wx/osx/core/cfstring.h"
+    #include "wx/osx/core/cfref.h"
+    #include <CoreFoundation/CFLocale.h>
+    #include "wx/osx/core/cfstring.h"

     #include <xlocale.h>
 #endif
 
     #include <xlocale.h>
 #endif
 


@@ -643,7 +643,7 @@ int wxVsprintf(wchar_t *str, const wxString& format, va_list argptr)
 #if wxUSE_UNICODE_WCHAR
 #ifdef __DMC__
 /*
 #if wxUSE_UNICODE_WCHAR
 #ifdef __DMC__
 /*

-This fails with a bug similar to 
+This fails with a bug similar to

 http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=680
 in DMC 8.49 and 8.50
 I don't see it being used in the wxWidgets sources at present (oct 2007) CE
 http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=680
 in DMC 8.49 and 8.50
 I don't see it being used in the wxWidgets sources at present (oct 2007) CE


@@ -797,17 +797,17 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz)
 #endif // wxCRT_StrdupW
 
 #ifndef wxWCHAR_T_IS_WXCHAR16
 #endif // wxCRT_StrdupW
 
 #ifndef wxWCHAR_T_IS_WXCHAR16

-size_t wxStrlen(const wxChar16 *s ) 
-{ 
-    if (!s) return 0; 
-    size_t i=0; 
-    while (*s!=0) { ++i; ++s; }; 
+size_t wxStrlen(const wxChar16 *s )
+{
+    if (!s) return 0;
+    size_t i=0;
+    while (*s!=0) { ++i; ++s; };

     return i;
 }
 
 wxChar16* wxStrdup(const wxChar16* s)
     return i;
 }
 
 wxChar16* wxStrdup(const wxChar16* s)

-{ 
-  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); 
+{
+  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16);

   wxChar16 *ret = (wxChar16*) malloc(size);
   memcpy(ret, s, size);
   return ret;
   wxChar16 *ret = (wxChar16*) malloc(size);
   memcpy(ret, s, size);
   return ret;


@@ -815,17 +815,17 @@ wxChar16* wxStrdup(const wxChar16* s)
 #endif
 
 #ifndef wxWCHAR_T_IS_WXCHAR32
 #endif
 
 #ifndef wxWCHAR_T_IS_WXCHAR32

-size_t wxStrlen(const wxChar32 *s ) 
-{ 
-    if (!s) return 0; 
-    size_t i=0; 
-    while (*s!=0) { ++i; ++s; }; 
+size_t wxStrlen(const wxChar32 *s )
+{
+    if (!s) return 0;
+    size_t i=0;
+    while (*s!=0) { ++i; ++s; };

     return i;
 }
 
 wxChar32* wxStrdup(const wxChar32* s)
     return i;
 }
 
 wxChar32* wxStrdup(const wxChar32* s)

-{ 
-  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); 
+{
+  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32);

   wxChar32 *ret = (wxChar32*) malloc(size);
   memcpy(ret, s, size);
   return ret;
   wxChar32 *ret = (wxChar32*) malloc(size);
   memcpy(ret, s, size);
   return ret;

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index 96c8a558caa48b79420cad5eca08c6de82d1280e..2f71cbc8798575e083c8f0c90fb3e2449aac80ed 100644 (file)
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -153,7 +153,7 @@ void wxXLocale::Init(const char *loc)
             m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL);
         }
     }
             m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL);
         }
     }

-    
+

     // TODO: wxLocale performs many more manipulations of the given locale
     //       string in the attempt to set a valid locale; reusing that code
     //       (changing it to take a generic wxTryLocale callback) would be nice
     // TODO: wxLocale performs many more manipulations of the given locale
     //       string in the attempt to set a valid locale; reusing that code
     //       (changing it to take a generic wxTryLocale callback) would be nice


@@ -313,7 +313,7 @@ double wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc)
 }
 
 long wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc)
 }
 
 long wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc)

-{ 
+{

     IMPLEMENT_STRTOX_L_START
     long ret = wxStrtol(str, endptr, base);
     IMPLEMENT_STRTOX_L_END
     IMPLEMENT_STRTOX_L_START
     long ret = wxStrtol(str, endptr, base);
     IMPLEMENT_STRTOX_L_END

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index cb2ba6c4fabe44d6fa8379daab9ff68839943dad..8283811fbb471f2a7ab24626eb3dd9f6fe1f34d5 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -88,13 +88,13 @@ wxGzipClassFactory::wxGzipClassFactory()
 const wxChar * const *
 wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
 {
 const wxChar * const *
 wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
 {

-    static const wxChar *protos[] =     
+    static const wxChar *protos[] =

         { wxT("gzip"), NULL };
         { wxT("gzip"), NULL };

-    static const wxChar *mimes[] =     
+    static const wxChar *mimes[] =

         { wxT("application/gzip"), wxT("application/x-gzip"), NULL };
         { wxT("application/gzip"), wxT("application/x-gzip"), NULL };

-    static const wxChar *encs[] = 
+    static const wxChar *encs[] =

         { wxT("gzip"), NULL };
         { wxT("gzip"), NULL };

-    static const wxChar *exts[] =    
+    static const wxChar *exts[] =

         { wxT(".gz"), wxT(".gzip"), NULL };
     static const wxChar *empty[] =
         { NULL };
         { wxT(".gz"), wxT(".gzip"), NULL };
     static const wxChar *empty[] =
         { NULL };

diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index 60f79e557ce5d7fa262da909437044b247cdb6a5..aa531dc103d17541c8d9cae2aea528cb1476fbc9 100644 (file)
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -595,7 +595,7 @@ void wxAnimationCtrl::DisposeToBackground()
 }
 
 void wxAnimationCtrl::DisposeToBackground(wxDC& dc)
 }
 
 void wxAnimationCtrl::DisposeToBackground(wxDC& dc)

-{ 
+{

     wxColour col = IsUsingWindowBackgroundColour()
                     ? GetBackgroundColour()
                     : m_animation.GetBackgroundColour();
     wxColour col = IsUsingWindowBackgroundColour()
                     ? GetBackgroundColour()
                     : m_animation.GetBackgroundColour();


@@ -628,7 +628,7 @@ void wxAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     if ( m_backingStore.IsOk() )
     {
         // NOTE: we draw the bitmap explicitely ignoring the mask (if any);
     if ( m_backingStore.IsOk() )
     {
         // NOTE: we draw the bitmap explicitely ignoring the mask (if any);

-        //       i.e. we don't want to combine the backing store with the 
+        //       i.e. we don't want to combine the backing store with the

         //       possibly wrong preexisting contents of the window!
         dc.DrawBitmap(m_backingStore, 0, 0, false /* no mask */);
     }
         //       possibly wrong preexisting contents of the window!
         dc.DrawBitmap(m_backingStore, 0, 0, false /* no mask */);
     }


@@ -681,9 +681,9 @@ void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event))
     //     when using them inside sizers.
     if (m_animation.IsOk())
     {
     //     when using them inside sizers.
     if (m_animation.IsOk())
     {

-        // be careful to change the backing store *only* if we are 
-        // playing the animation as otherwise we may be displaying 
-        // the inactive bitmap and overwriting the backing store 
+        // be careful to change the backing store *only* if we are
+        // playing the animation as otherwise we may be displaying
+        // the inactive bitmap and overwriting the backing store

         // with the last played frame is wrong in this case
         if (IsPlaying())
         {
         // with the last played frame is wrong in this case
         if (IsPlaying())
         {

diff --git a/src/generic/bmpcboxg.cpp b/src/generic/bmpcboxg.cpp
index 010132792fc4e928fec16bb00f8107a9817fcc39..bf888438444a7a141b753820ff81c49488fe5f32 100644 (file)
--- a/src/generic/bmpcboxg.cpp
+++ b/src/generic/bmpcboxg.cpp
@@ -337,7 +337,7 @@ void wxBitmapComboBox::OnDrawItem(wxDC& dc,
     {
         text = GetString(item);
     }
     {
         text = GetString(item);
     }

-    
+

     wxBitmapComboBoxBase::DrawItem(dc, rect, item, text, flags);
 }
 
     wxBitmapComboBoxBase::DrawItem(dc, rect, item, text, flags);
 }
 

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 7f354a8f3cac9625699f7645ab100c0f98fa9b60..3c07f3da368041d12b63b04cf909f72d1ea735c1 100644 (file)
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -280,7 +280,7 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
     // clear main background
     dc.DrawRectangle(rect);
 
     // clear main background
     dc.DrawRectangle(rect);

-    
+

     if ( !m_btn )
     {
         // Standard button rendering
     if ( !m_btn )
     {
         // Standard button rendering

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 7887465b1c405edc8d937818c7d03b2d5e8edd1c..9b6c2759cb73d6ccda55b834c30d907cf68719a9 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2081,7 +2081,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         wxDataViewVirtualListModel *list_model =
             (wxDataViewVirtualListModel*) GetOwner()->GetModel();
         m_count = list_model->GetCount();
         wxDataViewVirtualListModel *list_model =
             (wxDataViewVirtualListModel*) GetOwner()->GetModel();
         m_count = list_model->GetCount();

-        
+

         if( m_currentRow > GetRowCount() )
             m_currentRow = m_count - 1;
 
         if( m_currentRow > GetRowCount() )
             m_currentRow = m_count - 1;
 


@@ -3192,7 +3192,7 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item,
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(row);
         indent = GetOwner()->GetIndent() * node->GetIndentLevel();
     {
         wxDataViewTreeNode* node = GetTreeNodeByRow(row);
         indent = GetOwner()->GetIndent() * node->GetIndentLevel();

-        indent = indent + m_lineHeight;        // use m_lineHeight as the width of the expander
+        indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander

 
         if(!node->HasChildren())
             delete node;
 
         if(!node->HasChildren())
             delete node;


@@ -3215,7 +3215,7 @@ int wxDataViewMainWindow::RecalculateCount()
     {
         wxDataViewVirtualListModel *list_model =
             (wxDataViewVirtualListModel*) GetOwner()->GetModel();
     {
         wxDataViewVirtualListModel *list_model =
             (wxDataViewVirtualListModel*) GetOwner()->GetModel();

-            
+

         return list_model->GetCount();
     }
     else
         return list_model->GetCount();
     }
     else

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 7148eef2d11a03cbeb6276216da9fac39deca62d..13af995249323b74b27d62534bf26dcc895fe43b 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1935,7 +1935,7 @@ bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,

-                           wxRasterOperationMode rop, 
+                           wxRasterOperationMode rop,

                            bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
                            bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index dd64d2706ef9b1a3d49ebc5f01ff9e17ad393b31..af0031b53661348b821afd5c84a55c9ef295d3f5 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -346,7 +346,7 @@ public:
     virtual void BeginLayer(wxDouble opacity);
 
     virtual void EndLayer();
     virtual void BeginLayer(wxDouble opacity);
 
     virtual void EndLayer();

-    
+

     virtual void StrokePath( const wxGraphicsPath& p );
     virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE );
 
     virtual void StrokePath( const wxGraphicsPath& p );
     virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE );
 


@@ -380,7 +380,7 @@ private:
     void Init(cairo_t *context);
 
     cairo_t* m_context;
     void Init(cairo_t *context);
 
     cairo_t* m_context;

-    
+

     wxVector<float> m_layerOpacities;
 
     wxDECLARE_NO_COPY_CLASS(wxCairoContext);
     wxVector<float> m_layerOpacities;
 
     wxDECLARE_NO_COPY_CLASS(wxCairoContext);


@@ -1437,8 +1437,8 @@ void wxCairoContext::DoDrawText(const wxString& str, wxDouble x, wxDouble y)
     wxCairoFontData* font_data = (wxCairoFontData*) m_font.GetRefData();
     pango_layout_set_font_description( layout, font_data->GetFont());
     pango_layout_set_text(layout, data, datalen);
     wxCairoFontData* font_data = (wxCairoFontData*) m_font.GetRefData();
     pango_layout_set_font_description( layout, font_data->GetFont());
     pango_layout_set_text(layout, data, datalen);

-    
-    if (font_data->GetUnderlined()) 
+
+    if (font_data->GetUnderlined())

     {
         PangoAttrList *attrs = pango_attr_list_new();
         PangoAttribute *attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
     {
         PangoAttrList *attrs = pango_attr_list_new();
         PangoAttribute *attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);


@@ -1564,7 +1564,7 @@ bool wxCairoContext::SetAntialiasMode(wxAntialiasMode antialias)
         return true;
 
     m_antialias = antialias;
         return true;
 
     m_antialias = antialias;

-    
+

     cairo_antialias_t antialiasMode;
     switch (antialias)
     {
     cairo_antialias_t antialiasMode;
     switch (antialias)
     {


@@ -1585,7 +1585,7 @@ bool wxCairoContext::SetCompositionMode(wxCompositionMode op)
 {
     if ( m_composition == op )
         return true;
 {
     if ( m_composition == op )
         return true;

-        
+

     m_composition = op;
     cairo_operator_t cop;
     switch (op)
     m_composition = op;
     cairo_operator_t cop;
     switch (op)


@@ -1649,7 +1649,7 @@ void wxCairoContext::EndLayer()
     cairo_pop_group_to_source(m_context);
     cairo_paint_with_alpha(m_context,opacity);
 }
     cairo_pop_group_to_source(m_context);
     cairo_paint_with_alpha(m_context,opacity);
 }

-    
+

 //-----------------------------------------------------------------------------
 // wxCairoRenderer declaration
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxCairoRenderer declaration
 //-----------------------------------------------------------------------------

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 50a265d8c720e16fe00855e77865ae9784594bb6..e4d2608d211e2376ef06a44c2e7aaf0bf7e14578 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -24,7 +24,7 @@
     #include "wx/textctrl.h"
     #include "wx/dc.h"
     #include "wx/combobox.h"
     #include "wx/textctrl.h"
     #include "wx/dc.h"
     #include "wx/combobox.h"

-       #include "wx/settings.h"
+    #include "wx/settings.h"

     #include "wx/log.h"
     #include "wx/checkbox.h"
 #endif // WX_PRECOMP
     #include "wx/log.h"
     #include "wx/checkbox.h"
 #endif // WX_PRECOMP

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index ac50c2e17355fec287acf83a95bbc7e50213fec2..88f63ed867ab36cd1520215e019a6bd29f976df5 100644 (file)
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -482,7 +482,7 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     int w, h;
     GetClientSize(&w, &h);
 {
     int w, h;
     GetClientSize(&w, &h);

-    
+

 #ifdef __WXGTK__
 //    int vw;
 //    GetVirtualSize(&vw, NULL);
 #ifdef __WXGTK__
 //    int vw;
 //    GetVirtualSize(&vw, NULL);


@@ -528,7 +528,7 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         {
             state = wxCONTROL_DISABLED;
         }
         {
             state = wxCONTROL_DISABLED;
         }

-        
+

         if (i == 0)
            state |= wxCONTROL_SPECIAL;
 
         if (i == 0)
            state |= wxCONTROL_SPECIAL;
 


@@ -536,7 +536,7 @@ void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         params.m_labelText = col.GetTitle();
         params.m_labelBitmap = col.GetBitmap();
         params.m_labelAlignment = col.GetAlignment();
         params.m_labelText = col.GetTitle();
         params.m_labelBitmap = col.GetBitmap();
         params.m_labelAlignment = col.GetAlignment();

-        
+

 #ifdef __WXGTK__
         if (i == count-1)
         {
 #ifdef __WXGTK__
         if (i == count-1)
         {

diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp
index 07b9b2468fee253b177d00f6271c43fbc3907850..4e81ddad9f97effcb28cb223c5cfc97473ef67b7 100644 (file)
--- a/src/generic/hyperlinkg.cpp
+++ b/src/generic/hyperlinkg.cpp
@@ -195,7 +195,7 @@ void wxGenericHyperlinkCtrl::OnLeftDown(wxMouseEvent& event)
 void wxGenericHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 {
     // the click must be started and ended in the hyperlink rect
 void wxGenericHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 {
     // the click must be started and ended in the hyperlink rect

-    if (!m_clicking || !GetLabelRect().Contains(event.GetPosition())) 
+    if (!m_clicking || !GetLabelRect().Contains(event.GetPosition()))

         return;
 
     SetForegroundColour(m_visitedColour);
         return;
 
     SetForegroundColour(m_visitedColour);

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 5b89e26230204dac5565cb4acc93ed37e2cb5bd9..a30275fb18d337529ab638acb432eca56aa226a5 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -82,8 +82,8 @@ int wxPalette::GetColoursCount() const
 {
     if (m_refData)
         return M_PALETTEDATA->m_count;
 {
     if (m_refData)
         return M_PALETTEDATA->m_count;

-    
-    return 0;    
+
+    return 0;

 }
 
 bool wxPalette::Create(int n,
 }
 
 bool wxPalette::Create(int n,

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 54458cd201d75856631606eee6e154dadb419e68..a05eca8d07f3236da1a2bf80569b3deca4bf8c67 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -145,7 +145,7 @@ END_EVENT_TABLE()
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)

-                    : wxPrintDialogBase(GetParentForModalDialog(parent), 
+                    : wxPrintDialogBase(GetParentForModalDialog(parent),

                                wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |


@@ -159,7 +159,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)

-                    : wxPrintDialogBase(GetParentForModalDialog(parent), 
+                    : wxPrintDialogBase(GetParentForModalDialog(parent),

                                 wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                 wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |


@@ -462,9 +462,9 @@ static const char * check_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */
 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */

-"      s None  c None",
-"X     c #000000",
-".     c #808080",
+"  s None c None",
+"X c #000000",
+". c #808080",

 /* pixels */
 "                ",
 "                ",
 /* pixels */
 "                ",
 "                ",

diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index 6c358e10addc16dc402a3b6266b2e01015342a84..fc29ab59fdbd0d1b2ad2df70775afb06248a1bef 100644 (file)
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -271,7 +271,7 @@ wxRegionGeneric::wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRi
     m_refData = new wxRegionRefData(topLeft, bottomRight);
 }
 
     m_refData = new wxRegionRefData(topLeft, bottomRight);
 }
 

-wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp) 
+wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp)

 {
     wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp)");
 }
 {
     wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp)");
 }

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 3169ef6612d816934227a9459a3a2ab3ee42e88a..740df48eed026e533fefd1aa232566f25270ffd6 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -75,7 +75,7 @@ gboolean statusbar_query_tooltip(GtkWidget*   WXUNUSED(widget),
     const wxString& str = statbar->GetStatusText(n);
     if (str.empty())
         return FALSE;
     const wxString& str = statbar->GetStatusText(n);
     if (str.empty())
         return FALSE;

-    
+

     gtk_tooltip_set_text(tooltip, wxGTK_CONV_SYS(str));
     return TRUE;
 }
     gtk_tooltip_set_text(tooltip, wxGTK_CONV_SYS(str));
     return TRUE;
 }


@@ -129,14 +129,14 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
     SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
 
     SetFieldsCount(1);
     SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
 
     SetFieldsCount(1);

-    
+

 #if defined( __WXGTK20__ )
 #if GTK_CHECK_VERSION(2,12,0)
     if (HasFlag(wxSTB_SHOW_TIPS) && !gtk_check_version(2,12,0))
     {
 #if defined( __WXGTK20__ )
 #if GTK_CHECK_VERSION(2,12,0)
     if (HasFlag(wxSTB_SHOW_TIPS) && !gtk_check_version(2,12,0))
     {

-        g_object_set(m_widget, "has-tooltip", TRUE, NULL); 
-        g_signal_connect(m_widget, "query-tooltip",  
-                         G_CALLBACK(statusbar_query_tooltip), this); 
+        g_object_set(m_widget, "has-tooltip", TRUE, NULL);
+        g_signal_connect(m_widget, "query-tooltip",
+                         G_CALLBACK(statusbar_query_tooltip), this);

     }
 #endif
 #endif
     }
 #endif
 #endif


@@ -228,7 +228,7 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
     }
 
     // eventually ellipsize the text so that it fits the field width
     }
 
     // eventually ellipsize the text so that it fits the field width

-    
+

     wxEllipsizeMode ellmode = (wxEllipsizeMode)-1;
     if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
     else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;
     wxEllipsizeMode ellmode = (wxEllipsizeMode)-1;
     if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
     else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;


@@ -251,8 +251,8 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
                                     wxELLIPSIZE_EXPAND_TAB);
             // Ellipsize() will do something only if necessary
 
                                     wxELLIPSIZE_EXPAND_TAB);
             // Ellipsize() will do something only if necessary
 

-        // update the ellipsization status for this pane; this is used later to 
-        // decide whether a tooltip should be shown or not for this pane 
+        // update the ellipsization status for this pane; this is used later to
+        // decide whether a tooltip should be shown or not for this pane

         // (if we have wxSTB_SHOW_TIPS)
         SetEllipsizedFlag(i, text != GetStatusText(i));
     }
         // (if we have wxSTB_SHOW_TIPS)
         SetEllipsizedFlag(i, text != GetStatusText(i));
     }


@@ -264,7 +264,7 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
 
     // draw the text
     dc.DrawText(text, xpos, ypos);
 
     // draw the text
     dc.DrawText(text, xpos, ypos);

-    
+

     if (ellmode == (wxEllipsizeMode)-1)
         dc.DestroyClippingRegion();
 }
     if (ellmode == (wxEllipsizeMode)-1)
         dc.DestroyClippingRegion();
 }


@@ -347,7 +347,7 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const
 
     // NOTE: we explicitely don't take in count the borders since they are only
     //       useful when rendering the status text, not for hit-test computations
 
     // NOTE: we explicitely don't take in count the borders since they are only
     //       useful when rendering the status text, not for hit-test computations

-    
+

     if (pt.y <= 0 || pt.y >= m_lastClientHeight)
         return wxNOT_FOUND;
 
     if (pt.y <= 0 || pt.y >= m_lastClientHeight)
         return wxNOT_FOUND;
 


@@ -356,7 +356,7 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const
     {
         if (pt.x > x && pt.x < x+m_widthsAbs[i])
             return i;
     {
         if (pt.x > x && pt.x < x+m_widthsAbs[i])
             return i;

-        
+

         x += m_widthsAbs[i];
     }
 
         x += m_widthsAbs[i];
     }
 

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index a98c29da79d1a7c68a6025582cd3141c04baf68c..7ce1079c42257a180a620eaf063654db1fb4bd7a 100644 (file)
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -936,7 +936,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxHVScrolledWindow, wxPanel)
 // wxVarVScrollLegacyAdaptor
 // ===========================================================================
 
 // wxVarVScrollLegacyAdaptor
 // ===========================================================================
 

-size_t wxVarVScrollLegacyAdaptor::GetFirstVisibleLine() const 
+size_t wxVarVScrollLegacyAdaptor::GetFirstVisibleLine() const

 { return GetVisibleRowsBegin(); }
 
 size_t wxVarVScrollLegacyAdaptor::GetLastVisibleLine() const
 { return GetVisibleRowsBegin(); }
 
 size_t wxVarVScrollLegacyAdaptor::GetLastVisibleLine() const


@@ -953,13 +953,13 @@ void wxVarVScrollLegacyAdaptor::RefreshLine(size_t line)
 
 void wxVarVScrollLegacyAdaptor::RefreshLines(size_t from, size_t to)
 { RefreshRows(from, to); }
 
 void wxVarVScrollLegacyAdaptor::RefreshLines(size_t from, size_t to)
 { RefreshRows(from, to); }

-        
+

 bool wxVarVScrollLegacyAdaptor::ScrollToLine(size_t line)
 { return ScrollToRow(line); }
 
 bool wxVarVScrollLegacyAdaptor::ScrollLines(int lines)
 { return ScrollRows(lines); }
 bool wxVarVScrollLegacyAdaptor::ScrollToLine(size_t line)
 { return ScrollToRow(line); }
 
 bool wxVarVScrollLegacyAdaptor::ScrollLines(int lines)
 { return ScrollRows(lines); }

-        
+

 bool wxVarVScrollLegacyAdaptor::ScrollPages(int pages)
 { return ScrollRowPages(pages); }
 
 bool wxVarVScrollLegacyAdaptor::ScrollPages(int pages)
 { return ScrollRowPages(pages); }
 

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index e7b62f581f0ca29e02832f0cb428ef23d592a916..82af511d4b76234302f58731b5e97cbbc00e1851 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -916,7 +916,7 @@ bool wxWizard::DoLayoutAdaptation()
 
     // Size event doesn't get sent soon enough on wxGTK
     DoLayout();
 
     // Size event doesn't get sent soon enough on wxGTK
     DoLayout();

-    
+

     SetLayoutAdaptationDone(true);
 
     return true;
     SetLayoutAdaptationDone(true);
 
     return true;

diff --git a/src/gtk/calctrl.cpp b/src/gtk/calctrl.cpp
index 2da9293d0bb3f35f1272bcf9e0f50dac88e79557..3672664b25dca0f746288a3dc8334b1601e6b4ea 100644 (file)
--- a/src/gtk/calctrl.cpp
+++ b/src/gtk/calctrl.cpp
@@ -142,17 +142,17 @@ bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date)
 {
     g_signal_handlers_block_by_func(m_widget,
         (gpointer) gtk_day_selected_callback, this);
 {
     g_signal_handlers_block_by_func(m_widget,
         (gpointer) gtk_day_selected_callback, this);

-        
+

     m_selectedDate = date;
     int year = date.GetYear();
     int month = date.GetMonth();
     int day = date.GetDay();
     gtk_calendar_select_month(GTK_CALENDAR(m_widget), month, year);
     gtk_calendar_select_day(GTK_CALENDAR(m_widget), day);
     m_selectedDate = date;
     int year = date.GetYear();
     int month = date.GetMonth();
     int day = date.GetDay();
     gtk_calendar_select_month(GTK_CALENDAR(m_widget), month, year);
     gtk_calendar_select_day(GTK_CALENDAR(m_widget), day);

-    
+

     g_signal_handlers_unblock_by_func( m_widget,
         (gpointer) gtk_day_selected_callback, this);
     g_signal_handlers_unblock_by_func( m_widget,
         (gpointer) gtk_day_selected_callback, this);

-    
+

     return true;
 }
 
     return true;
 }
 

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index b4043d60304ecad1f26667a6d02da590f8bdc937..82606be7ffda18fb9c6874a8b30b37fc9caf0a27 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -171,7 +171,7 @@ void wxCheckBox::SetValue( bool state )
 
     if (state == GetValue())
         return;
 
     if (state == GetValue())
         return;

- 
+

     GTKDisableEvents();
 
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
     GTKDisableEvents();
 
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 9a71c3cc2a1ddc2f99c2e85cef86aace04ceb8d9..0dedcab00bc284214fef93b866bb7d4447ef1e1a 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -72,13 +72,13 @@ wxCursor::wxCursor(const wxString& cursor_file,
     wxImage img;
     if (!img.LoadFile(cursor_file, type))
         return;
     wxImage img;
     if (!img.LoadFile(cursor_file, type))
         return;

-    
+

     // eventually set the hotspot:
     if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
         img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX);
     if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
         img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY);
     // eventually set the hotspot:
     if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
         img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX);
     if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
         img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY);

-    
+

     InitFromImage(img);
 }
 
     InitFromImage(img);
 }
 

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 85fcee31858bc2d3543d769391de98e13e35eaac..15855368b10e981f25e610aa7d518d86d63d8f9a 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -853,7 +853,7 @@ typedef struct _GtkWxCellRendererTextClass GtkWxCellRendererTextClass;
 struct _GtkWxCellRendererText
 {
   GtkCellRendererText parent;
 struct _GtkWxCellRendererText
 {
   GtkCellRendererText parent;

-  
+

   wxDataViewRenderer *wx_renderer;
 };
 
   wxDataViewRenderer *wx_renderer;
 };
 


@@ -969,7 +969,7 @@ static GtkCellEditable *gtk_wx_cell_renderer_text_start_editing(
     event.SetColumn( wx_renderer->GetOwner()->GetModelColumn() );
     event.SetItem( item );
     dv->HandleWindowEvent( event );
     event.SetColumn( wx_renderer->GetOwner()->GetModelColumn() );
     event.SetItem( item );
     dv->HandleWindowEvent( event );

-    
+

     if (event.IsAllowed())
         return GTK_CELL_RENDERER_CLASS(text_cell_parent_class)->
            start_editing( gtk_renderer, gdk_event, widget, path, background_area, cell_area, flags );
     if (event.IsAllowed())
         return GTK_CELL_RENDERER_CLASS(text_cell_parent_class)->
            start_editing( gtk_renderer, gdk_event, widget, path, background_area, cell_area, flags );


@@ -1489,7 +1489,7 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
 bool wxGtkDataViewModelNotifier::Cleared()
 {
     m_owner->GtkGetInternal()->Cleared();
 bool wxGtkDataViewModelNotifier::Cleared()
 {
     m_owner->GtkGetInternal()->Cleared();

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -1562,8 +1562,8 @@ void wxDataViewRenderer::GtkInitHandlers()
     if (!gtk_check_version(2,6,0))
     {
         g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started",
     if (!gtk_check_version(2,6,0))
     {
         g_signal_connect (GTK_CELL_RENDERER(m_renderer), "editing_started",

-                   G_CALLBACK (wxgtk_renderer_editing_started),
-                   this);
+            G_CALLBACK (wxgtk_renderer_editing_started),
+            this);

     }
 }
 
     }
 }
 


@@ -3025,10 +3025,10 @@ void wxGtkTreeModelNode::Resort()
     // Sort the ptrs
     gs_internal = m_internal;
     ptrs.Sort( &wxGtkTreeModelChildPtrCmp );
     // Sort the ptrs
     gs_internal = m_internal;
     ptrs.Sort( &wxGtkTreeModelChildPtrCmp );

- 
+

     wxGtkTreeModelChildren temp;
     void** base_ptr = &(m_children[0]);
     wxGtkTreeModelChildren temp;
     void** base_ptr = &(m_children[0]);

-    // Transfer positions to new_order array and 
+    // Transfer positions to new_order array and

     // IDs to temp
     for (i = 0; i < child_count; i++)
     {
     // IDs to temp
     for (i = 0; i < child_count; i++)
     {


@@ -3068,13 +3068,13 @@ void wxGtkTreeModelNode::Resort()
 
 #if 0
     // Too slow
 
 #if 0
     // Too slow

-    
+

     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );
 
     gs_internal = m_internal;
     m_children.Sort( &wxGtkTreeModelChildCmp );
     wxGtkTreeModelChildren temp;
     WX_APPEND_ARRAY( temp, m_children );
 
     gs_internal = m_internal;
     m_children.Sort( &wxGtkTreeModelChildCmp );

-    
+

     unsigned int pos;
     for (pos = 0; pos < child_count; pos++)
     {
     unsigned int pos;
     for (pos = 0; pos < child_count; pos++)
     {


@@ -3097,7 +3097,7 @@ void wxGtkTreeModelNode::Resort()
     gtk_tree_path_free (path);
 
     delete [] new_order;
     gtk_tree_path_free (path);
 
     delete [] new_order;

-    
+

     unsigned int pos;
     for (pos = 0; pos < node_count; pos++)
     {
     unsigned int pos;
     for (pos = 0; pos < node_count; pos++)
     {


@@ -3317,13 +3317,13 @@ bool wxDataViewCtrlInternal::Cleared()
     GtkWidget* tree_widget = GetOwner()->GtkGetTreeView();
     gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), NULL );
     gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), GTK_TREE_MODEL(m_gtk_model) );
     GtkWidget* tree_widget = GetOwner()->GtkGetTreeView();
     gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), NULL );
     gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), GTK_TREE_MODEL(m_gtk_model) );

-    
+

     if (m_root)
     {
         delete m_root;
         InitTree();
     }
     if (m_root)
     {
         delete m_root;
         InitTree();
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -3404,9 +3404,9 @@ gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path
     if (m_wx_model->IsVirtualListModel())
     {
         wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;
     if (m_wx_model->IsVirtualListModel())
     {
         wxDataViewVirtualListModel *wx_model = (wxDataViewVirtualListModel*) m_wx_model;

-    
+

         unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
         unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];

-        
+

         if (i >= wx_model->GetCount())
             return FALSE;
 
         if (i >= wx_model->GetCount())
             return FALSE;
 


@@ -3506,7 +3506,7 @@ gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
             iter->user_data = NULL;
             return FALSE;
         }
             iter->user_data = NULL;
             return FALSE;
         }

-        
+

         // user_data is just the index +1 (+2 because we need the next)
         iter->user_data = (gpointer) (n+2);
     }
         // user_data is just the index +1 (+2 because we need the next)
         iter->user_data = (gpointer) (n+2);
     }


@@ -3555,7 +3555,7 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
             iter->user_data = (gpointer) m_root->GetChildren().Item( 0 );
             return TRUE;
         }
             iter->user_data = (gpointer) m_root->GetChildren().Item( 0 );
             return TRUE;
         }

-        
+

         wxDataViewItem item( (void*) parent->user_data );
 
         if (!m_wx_model->IsContainer( item ))
         wxDataViewItem item( (void*) parent->user_data );
 
         if (!m_wx_model->IsContainer( item ))


@@ -3585,7 +3585,7 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
 
         if (iter == NULL)
             return (wx_model->GetCount() > 0);
 
         if (iter == NULL)
             return (wx_model->GetCount() > 0);

-        
+

         // this is a list, nodes have no children
         return FALSE;
     }
         // this is a list, nodes have no children
         return FALSE;
     }


@@ -3593,7 +3593,7 @@ gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
     {
         if (iter == NULL)
             return (m_root->GetChildCount() > 0);
     {
         if (iter == NULL)
             return (m_root->GetChildCount() > 0);

-    
+

         wxDataViewItem item( (void*) iter->user_data );
 
         bool is_container = m_wx_model->IsContainer( item );
         wxDataViewItem item( (void*) iter->user_data );
 
         bool is_container = m_wx_model->IsContainer( item );

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 5d182e84d40331c00f9e1c94a79750ba3eb30c03..5998f8b674405c587faeb51587bce7741d22dc9b 100644 (file)
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -18,7 +18,7 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl)
 

-wxGTKDCImpl::wxGTKDCImpl( wxDC *owner ) 
+wxGTKDCImpl::wxGTKDCImpl( wxDC *owner )

    : wxDCImpl( owner )
 {
     m_ok = FALSE;
    : wxDCImpl( owner )
 {
     m_ok = FALSE;

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index e1ce88efa29b8be7b7cebdf3c5b06c2c7c4e225e..459091712798d6c56549b85c156fed7cda666182 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -22,17 +22,17 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )

   : wxWindowDCImpl( owner )
   : wxWindowDCImpl( owner )

-{ 
-    Init(); 
+{
+    Init();

 }
 
 }
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap) 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap)

   : wxWindowDCImpl( owner )
   : wxWindowDCImpl( owner )

-{ 
-    Init(); 
-    DoSelect(bitmap); 
+{
+    Init();
+    DoSelect(bitmap);

 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) )

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index e32427f51ebc85b92e72e04d1af082f5ac0d490b..6a0f1e655d91eb14b91a9b477c6fa063ef660aed 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -27,10 +27,10 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
 

-wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) 
+wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )

   : wxWindowDCImpl( owner )
   : wxWindowDCImpl( owner )

-{ 
-    Init(); 
+{
+    Init();

 }
 
 void wxScreenDCImpl::Init()
 }
 
 void wxScreenDCImpl::Init()

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 360a255a0ab3ddec6f0da7763500f825a8e9f6c6..db30dd5c47714b5d365c603ff8d25128c89abd68 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -237,7 +237,7 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
     else if (drop_target->GetDefaultAction() == wxDragMove &&
                 (context->actions & GDK_ACTION_MOVE))
     {
     else if (drop_target->GetDefaultAction() == wxDragMove &&
                 (context->actions & GDK_ACTION_MOVE))
     {

-        
+

        result = wxDragMove;
     }
     else
        result = wxDragMove;
     }
     else

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index c54fa804d23caa545554493b6905c0c327d8821d..e05af19f5d0f8b45db00d19e1e42af57eb60f2b6 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -138,11 +138,11 @@ static void wxgtk_main_do_event(GdkEvent *event, wxGUIEventLoop* evtloop)
     // categorize the GDK event according to wxEventCategory.
     // See http://library.gnome.org/devel/gdk/unstable/gdk-Events.html#GdkEventType
     // for more info.
     // categorize the GDK event according to wxEventCategory.
     // See http://library.gnome.org/devel/gdk/unstable/gdk-Events.html#GdkEventType
     // for more info.

-    
+

     // NOTE: GDK_* constants which were not present in the GDK2.0 can be tested for
     //       only at compile-time; when running the program (compiled with a recent GDK)
     // NOTE: GDK_* constants which were not present in the GDK2.0 can be tested for
     //       only at compile-time; when running the program (compiled with a recent GDK)

-    //       on a system with an older GDK lib we can be sure there won't be problems 
-    //       because event->type will never assume those values corresponding to 
+    //       on a system with an older GDK lib we can be sure there won't be problems
+    //       because event->type will never assume those values corresponding to

     //       new event types (since new event types are always added in GDK with non
     //       conflicting values for ABI compatibility).
 
     //       new event types (since new event types are always added in GDK with non
     //       conflicting values for ABI compatibility).
 

diff --git a/src/gtk/filectrl.cpp b/src/gtk/filectrl.cpp
index 8be3759997ada405af3c735be907db78bc9347e6..1b00e343eef865058aa94b7620a9064223f9a2fd 100644 (file)
--- a/src/gtk/filectrl.cpp
+++ b/src/gtk/filectrl.cpp
@@ -146,13 +146,13 @@ void wxGtkFileChooser::SetWildcard( const wxString& wildCard )
                 gtk_file_filter_set_name( filter, wxGTK_CONV_SYS( wildDescriptions[n] ) );
 
                 wxStringTokenizer exttok( wildFilters[n], wxT( ";" ) );
                 gtk_file_filter_set_name( filter, wxGTK_CONV_SYS( wildDescriptions[n] ) );
 
                 wxStringTokenizer exttok( wildFilters[n], wxT( ";" ) );

-                
+

                 int n1 = 1;
                 while ( exttok.HasMoreTokens() )
                 {
                     wxString token = exttok.GetNextToken();
                     gtk_file_filter_add_pattern( filter, wxGTK_CONV_SYS( token ) );
                 int n1 = 1;
                 while ( exttok.HasMoreTokens() )
                 {
                     wxString token = exttok.GetNextToken();
                     gtk_file_filter_add_pattern( filter, wxGTK_CONV_SYS( token ) );

-                    
+

                     if (n1 == 1)
                         m_wildcards.Add( token ); // Only add first pattern to list, used later when saving
                     n1++;
                     if (n1 == 1)
                         m_wildcards.Add( token ); // Only add first pattern to list, used later when saving
                     n1++;

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index d7a2d8a57e663aeaf1d48044df60b2f4de0e56f9..ff7541c6b7df642071d735cfe040651a9bb8afba 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_FILEDLG 
+#if wxUSE_FILEDLG

 
 #include "wx/filedlg.h"
 
 
 #include "wx/filedlg.h"
 


@@ -320,8 +320,8 @@ int wxFileDialog::ShowModal()
     return wxDialog::ShowModal();
 }
 
     return wxDialog::ShowModal();
 }
 

-void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), 
-                             int WXUNUSED(width), int WXUNUSED(height), 
+void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+                             int WXUNUSED(width), int WXUNUSED(height),

                              int WXUNUSED(sizeFlags))
 {
 }
                              int WXUNUSED(sizeFlags))
 {
 }


@@ -335,7 +335,7 @@ void wxFileDialog::OnSize(wxSizeEvent&)
 wxString wxFileDialog::GetPath() const
 {
     wxFileName fn = m_fc.GetPath();
 wxString wxFileDialog::GetPath() const
 {
     wxFileName fn = m_fc.GetPath();

-    
+

     if (HasFdFlag(wxFD_SAVE))
     {
         // add extension
     if (HasFdFlag(wxFD_SAVE))
     {
         // add extension


@@ -411,4 +411,4 @@ int wxFileDialog::GetFilterIndex() const
     return m_fc.GetFilterIndex();
 }
 
     return m_fc.GetFilterIndex();
 }
 

-#endif // wxUSE_FILEDLG 
+#endif // wxUSE_FILEDLG

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index ec160d82226e9880cec21f2794241b1cbd44a892..2b0f7fca9e8d7b468fc9f1ffcf33a9c129caf6a9 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -65,7 +65,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         m_wildcard = wildcard;
         if ((m_dialog = CreateDialog()) == NULL)
             return false;
         m_wildcard = wildcard;
         if ((m_dialog = CreateDialog()) == NULL)
             return false;

-            
+

         // little trick used to avoid problems when there are other GTK windows 'grabbed':
         // GtkFileChooserDialog won't be responsive to user events if there is another
         // window which called gtk_grab_add (and this happens if e.g. a wxDialog is running
         // little trick used to avoid problems when there are other GTK windows 'grabbed':
         // GtkFileChooserDialog won't be responsive to user events if there is another
         // window which called gtk_grab_add (and this happens if e.g. a wxDialog is running


@@ -80,7 +80,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
 
         //       use as label the currently selected file
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
 
         //       use as label the currently selected file
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );

-        
+

         g_object_ref(m_widget);
         gtk_widget_show(m_widget);
 
         g_object_ref(m_widget);
         gtk_widget_show(m_widget);
 


@@ -124,7 +124,7 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;

-    
+

     if (m_dialog)
         UpdateDialogPath(m_dialog);
 }
     if (m_dialog)
         UpdateDialogPath(m_dialog);
 }


@@ -227,7 +227,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
         g_object_ref(m_widget);
 
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
         g_object_ref(m_widget);
 

-        
+

         gtk_widget_show(m_widget);
 
         // GtkFileChooserButton signals
         gtk_widget_show(m_widget);
 
         // GtkFileChooserButton signals


@@ -250,7 +250,7 @@ wxDirButton::~wxDirButton()
 }
 
 void wxDirButton::GTKUpdatePath(const char *gtkpath)
 }
 
 void wxDirButton::GTKUpdatePath(const char *gtkpath)

-{ 
+{

     m_path = wxString::FromUTF8(gtkpath);
 }
 void wxDirButton::SetPath(const wxString& str)
     m_path = wxString::FromUTF8(gtkpath);
 }
 void wxDirButton::SetPath(const wxString& str)

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 00ab666ccdf95b13a3033c940f08f3c9606a6906..72b651732c9e90a51e535dae9dedf25af3bb6646 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -221,7 +221,7 @@ bool wxFontRefData::SetPixelSize(const wxSize& pixelSize)
         return false;
     }
 
         return false;
     }
 

-    pango_font_description_set_absolute_size( m_nativeFontInfo.description, 
+    pango_font_description_set_absolute_size( m_nativeFontInfo.description,

                                               pixelSize.GetHeight() * PANGO_SCALE );
 
     return true;
                                               pixelSize.GetHeight() * PANGO_SCALE );
 
     return true;

diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp
index b2cdb532e3bc8d11e4a69b46815c4b027f1f43d8..7eef011a453851b28b299b3a60a65605c29c97f5 100644 (file)
--- a/src/gtk/fontpicker.cpp
+++ b/src/gtk/fontpicker.cpp
@@ -17,7 +17,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_FONTPICKERCTRL 
+#if wxUSE_FONTPICKERCTRL

 
 #include "wx/fontpicker.h"
 
 
 #include "wx/fontpicker.h"
 

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 2fb0d7c57a04b360a628f61701d87a390bf5cf74..82c8f1ec54d85681c913fa47199ce51e52b1497d 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -163,7 +163,7 @@ static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
         wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
         entries[i] = (*entry);
         delete entry;
         wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
         entries[i] = (*entry);
         delete entry;

-        
+

     }
 
     wxAcceleratorTable table(n, entries);
     }
 
     wxAcceleratorTable table(n, entries);

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 2d56e77d82efc52675d9e2e034a1c42a7d20cbc7..dccdd75c778edcaa1207435aed3c67fd8c840704 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -174,7 +174,7 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {

-    if ((gdk_event->keyval == GDK_Return) || 
+    if ((gdk_event->keyval == GDK_Return) ||

         (gdk_event->keyval == GDK_ISO_Enter) ||
         (gdk_event->keyval == GDK_KP_Enter))
     {
         (gdk_event->keyval == GDK_ISO_Enter) ||
         (gdk_event->keyval == GDK_KP_Enter))
     {


@@ -188,12 +188,12 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                 return FALSE;
             index = sels[0];
         }
                 return FALSE;
             index = sels[0];
         }

-        
+

         if (index != wxNOT_FOUND)
         {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
             event.SetEventObject( listbox );
         if (index != wxNOT_FOUND)
         {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
             event.SetEventObject( listbox );

-            
+

             GtkTreeEntry* entry = listbox->GtkGetEntry( index );
 
             // indicate that this is a selection
             GtkTreeEntry* entry = listbox->GtkGetEntry( index );
 
             // indicate that this is a selection


@@ -212,7 +212,7 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
             /* bool ret = */ listbox->HandleWindowEvent( event );
 
             g_object_unref (entry);
             /* bool ret = */ listbox->HandleWindowEvent( event );
 
             g_object_unref (entry);

-            
+

 //          wxMac and wxMSW always invoke default action
 //          if (!ret)
             {
 //          wxMac and wxMSW always invoke default action
 //          if (!ret)
             {


@@ -225,13 +225,13 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                         gtk_window_activate_default( gtk_window );
                 }
             }
                         gtk_window_activate_default( gtk_window );
                 }
             }

-            
+

             // Always intercept, otherwise we'd get another dclick
             // event from row_activated
             return TRUE;
         }
     }
             // Always intercept, otherwise we'd get another dclick
             // event from row_activated
             return TRUE;
         }
     }

-    
+

     return FALSE;
 }
 }
     return FALSE;
 }
 }


@@ -476,7 +476,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     g_signal_connect_after (selection, "changed",
                             G_CALLBACK (gtk_listitem_changed_callback), this);
 
     g_signal_connect_after (selection, "changed",
                             G_CALLBACK (gtk_listitem_changed_callback), this);

- 
+

     return true;
 }
 
     return true;
 }
 


@@ -501,7 +501,7 @@ void wxListBox::GtkEnableEvents()
 
     g_signal_handlers_unblock_by_func(selection,
                                 (gpointer) gtk_listitem_changed_callback, this);
 
     g_signal_handlers_unblock_by_func(selection,
                                 (gpointer) gtk_listitem_changed_callback, this);

-                                
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -509,7 +509,7 @@ void wxListBox::GtkEnableEvents()
 void wxListBox::Update()
 {
     wxWindow::Update();
 void wxListBox::Update()
 {
     wxWindow::Update();

-    
+

     if (m_treeview)
         gdk_window_process_updates(GTK_WIDGET(m_treeview)->window, TRUE);
 }
     if (m_treeview)
         gdk_window_process_updates(GTK_WIDGET(m_treeview)->window, TRUE);
 }


@@ -575,7 +575,7 @@ void wxListBox::DoClear()
     InvalidateBestSize();
 
     gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
     InvalidateBestSize();
 
     gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */

-                                
+

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 


@@ -593,7 +593,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
     // this returns false if iter is invalid (e.g. deleting item at end) but
     // since we don't use iter, we ignore the return value
     gtk_list_store_remove(m_liststore, &iter);
     // this returns false if iter is invalid (e.g. deleting item at end) but
     // since we don't use iter, we ignore the return value
     gtk_list_store_remove(m_liststore, &iter);

-                                
+

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 


@@ -813,7 +813,7 @@ void wxListBox::DoSetSelection( int n, bool select )
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 
     GtkDisableEvents();
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 
     GtkDisableEvents();

-    
+

     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     // passing -1 to SetSelection() is documented to deselect all items
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     // passing -1 to SetSelection() is documented to deselect all items


@@ -826,7 +826,7 @@ void wxListBox::DoSetSelection( int n, bool select )
 
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
 
 
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
 

-    
+

     GtkTreeIter iter;
     wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") );
 
     GtkTreeIter iter;
     wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") );
 

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 8e4a1eb6e7ebb3eaa87aea8461f64ef3d769afd3..9778056ad3ee2f618731026e425025176e88ca3f 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -385,7 +385,7 @@ wxMDIClientWindow::~wxMDIClientWindow()
     // a call to gtk_mdi_page_change_callback with an invalid parent
     // (because gtk_mdi_page_change_callback expects a wxMDIClientWindow but
     //  at that point of the dtor chain we are a simple wxWindow!)
     // a call to gtk_mdi_page_change_callback with an invalid parent
     // (because gtk_mdi_page_change_callback expects a wxMDIClientWindow but
     //  at that point of the dtor chain we are a simple wxWindow!)

-    g_signal_handlers_disconnect_by_func(m_widget, 
+    g_signal_handlers_disconnect_by_func(m_widget,

                                          (gpointer)gtk_mdi_page_change_callback,
                                          GetParent());
 }
                                          (gpointer)gtk_mdi_page_change_callback,
                                          GetParent());
 }

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 834489387b4e11fa2e4ca659c3714d3c79a9d975..386208c34f3a129cb9a91b5a609940551b9d05e2 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -96,8 +96,8 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );

-        dc.DrawRectangle( win->m_miniEdge-1, 
-                          win->m_miniEdge-1, 
+        dc.DrawRectangle( win->m_miniEdge-1,
+                          win->m_miniEdge-1,

                           win->m_width - (2*(win->m_miniEdge-1)),
                           15  );
 
                           win->m_width - (2*(win->m_miniEdge-1)),
                           15  );
 


@@ -107,7 +107,7 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
         if (style & wxCLOSE_BOX)
             dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true );
     }
         if (style & wxCLOSE_BOX)
             dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true );
     }

-    
+

     return false;
 }
 }
     return false;
 }
 }

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index d2920aff509931c7d8ab80c0ce8bbff6f541f721..4802f31fcd7ec6dfc36be9593d97d486ef4a36c6 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -357,7 +357,7 @@ wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);
     delete p;
     wxGtkNotebookPage* p = GetNotebookPage(page);
     m_pagesData.DeleteObject(p);
     delete p;

-    
+

     return client;
 }
 
     return client;
 }
 

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index dd0fd634e51ff6eb357bc705edcbe45b5b9b22eb..15e9854112c88b156bf8ebd69249bf9580ae944f 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -124,7 +124,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
         if (!gtk_check_version(2,10,0))
             gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
 #endif
         if (!gtk_check_version(2,10,0))
             gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget));
 #endif

-    
+

         gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
     }
     gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);
         gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel));
     }
     gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE);


@@ -210,7 +210,7 @@ void wxPopupWindow::SetFocus()
             return;
         }
     }
             return;
         }
     }

-    
+

     wxPopupWindowBase::SetFocus();
 }
 
     wxPopupWindowBase::SetFocus();
 }
 

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 563e214334dc8e0e78db1edbbe75475a4ead0cb8..b72d8e6d8aef2d3873810270634d90c25d9bf687 100644 (file)
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -1427,8 +1427,8 @@ void wxGtkPrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, w
     cairo_stroke ( m_cairo);
 }
 
     cairo_stroke ( m_cairo);
 }
 

-void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], 
-                                       wxCoord xoffset, wxCoord yoffset, 
+void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
+                                       wxCoord xoffset, wxCoord yoffset,

                                        wxPolygonFillMode fillStyle)
 {
     if (n==0) return;
                                        wxPolygonFillMode fillStyle)
 {
     if (n==0) return;


@@ -1464,7 +1464,7 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
 }
 
 void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[],
 }
 
 void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[],

-                                           wxCoord xoffset, wxCoord yoffset, 
+                                           wxCoord xoffset, wxCoord yoffset,

                                            wxPolygonFillMode fillStyle)
 {
     wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
                                            wxPolygonFillMode fillStyle)
 {
     wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );

diff --git a/src/gtk/private.cpp b/src/gtk/private.cpp
index 29ffce697f599c0ec54a0483d316ed31de09325e..6c025795f0469988aafee8f3f78c23652cb83ecf 100644 (file)
--- a/src/gtk/private.cpp
+++ b/src/gtk/private.cpp
@@ -122,20 +122,20 @@ static void CreateHeaderButtons()
         // Get the dummy tree widget, give it a column, and then use the
         // widget in the column header for the rendering code.
         GtkWidget* treewidget = GetTreeWidget();
         // Get the dummy tree widget, give it a column, and then use the
         // widget in the column header for the rendering code.
         GtkWidget* treewidget = GetTreeWidget();

-        
+

         GtkTreeViewColumn *column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
         s_first_button = column->button;
         GtkTreeViewColumn *column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
         s_first_button = column->button;

-        
+

         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
         s_other_button = column->button;
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
         s_other_button = column->button;

-        
+

         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
         s_last_button = column->button;
 }
         column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
         s_last_button = column->button;
 }

-    
+

 GtkWidget *GetHeaderButtonWidgetFirst()
 {
     if (!s_first_button)
 GtkWidget *GetHeaderButtonWidgetFirst()
 {
     if (!s_first_button)

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 50f0ab0a5da493d77babb01b66e81e06d1762a92..2073c240461f5ee210affad11768de0b997a0cb9 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -90,7 +90,7 @@ wxRegion::wxRegion( GdkRegion *region )
     M_REGIONDATA->m_region = gdk_region_copy( region );
 }
 
     M_REGIONDATA->m_region = gdk_region_copy( region );
 }
 

-wxRegion::wxRegion( size_t n, const wxPoint *points, 
+wxRegion::wxRegion( size_t n, const wxPoint *points,

                     wxPolygonFillMode fillStyle )
 {
     GdkPoint *gdkpoints = new GdkPoint[n];
                     wxPolygonFillMode fillStyle )
 {
     GdkPoint *gdkpoints = new GdkPoint[n];

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index c1e14c9464b7c3bfba9b9cf69dbd2548f5d973eb..7de06c56e34fdf9535462bc6bb9776eff7adec82 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -257,13 +257,13 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
                 wxNativeFontInfo info;
                 info.description = ButtonStyle()->font_desc;
                 gs_fontSystem = wxFont(info);
                 wxNativeFontInfo info;
                 info.description = ButtonStyle()->font_desc;
                 gs_fontSystem = wxFont(info);

-                
+

                 // (try to) heal the default font (on some common systems e.g. Ubuntu
                 // it's "Sans Serif" but the real font is called "Sans"):
                 if (!wxFontEnumerator::IsValidFacename(gs_fontSystem.GetFaceName()) &&
                     gs_fontSystem.GetFaceName() == "Sans Serif")
                     gs_fontSystem.SetFaceName("Sans");
                 // (try to) heal the default font (on some common systems e.g. Ubuntu
                 // it's "Sans Serif" but the real font is called "Sans"):
                 if (!wxFontEnumerator::IsValidFacename(gs_fontSystem.GetFaceName()) &&
                     gs_fontSystem.GetFaceName() == "Sans Serif")
                     gs_fontSystem.SetFaceName("Sans");

-                
+

                 info.description = NULL;
             }
             font = gs_fontSystem;
                 info.description = NULL;
             }
             font = gs_fontSystem;

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index a82354bc28f81e0417437a7f4230df859817b3c2..72a26ebbcabb3b8d72627153aef851496c721673 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -32,7 +32,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
     GtkWidget* label_widget = gtk_frame_get_label_widget(GTK_FRAME(widget));
     int w = alloc->width -
         2 * widget->style->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;
     GtkWidget* label_widget = gtk_frame_get_label_widget(GTK_FRAME(widget));
     int w = alloc->width -
         2 * widget->style->xthickness - 2 * LABEL_PAD - 2 * LABEL_SIDE_PAD;

-    if (w < 0) 
+    if (w < 0)

         w = 0;
 
     if (label_widget->allocation.width > w)
         w = 0;
 
     if (label_widget->allocation.width > w)

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index e9366a1e380a65095122356967bfcac5c7c14dde..ebbd47c37cd4b400594e3fff73d7f866519e2cfa 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -131,7 +131,7 @@ void wxStaticText::SetLabel( const wxString& str )
         GTKSetLabelForLabel(GTK_LABEL(m_widget), label);
 
     // adjust the label size to the new label unless disabled
         GTKSetLabelForLabel(GTK_LABEL(m_widget), label);
 
     // adjust the label size to the new label unless disabled

-    if ( !HasFlag(wxST_NO_AUTORESIZE) && 
+    if ( !HasFlag(wxST_NO_AUTORESIZE) &&

          !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
         SetSize( GetBestSize() );
 }
          !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
         SetSize( GetBestSize() );
 }

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 3bac808b966273cf7bdac691ae07d7b1144a636c..b6915adb51c2745b10eb34f034fea37029f02ac0 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -780,7 +780,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
 void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect) )
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );
 void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect) )
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );

-    
+

     gtk_widget_queue_draw( m_widget );
 
     if (m_wxwindow && m_wxwindow->window)
     gtk_widget_queue_draw( m_widget );
 
     if (m_wxwindow && m_wxwindow->window)

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index a2abf1d037226d3b729bcae469e46c8da9334fbe..e14420108288c8d94d6988a9dfc7b2c678781c14 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -189,7 +189,7 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
     // NOTE: you don't need to use this macro to check for Pango features
     //       added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement
     //       for GTK lib) required pango 1.4...
     // NOTE: you don't need to use this macro to check for Pango features
     //       added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement
     //       for GTK lib) required pango 1.4...

-    
+

 #ifdef PANGO_VERSION_MAJOR
     if (!gtk_check_version (2,11,0))
     {
 #ifdef PANGO_VERSION_MAJOR
     if (!gtk_check_version (2,11,0))
     {

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index 13f596d26cfa85d4907f53430394c4f59df6601c..dcbe4fa2822f291ac94d377e3a5d98ace63f5060 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -87,7 +87,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
     }
 
     widget->allocation = *alloc;
     }
 
     widget->allocation = *alloc;

-    
+

     // adjust child positions
     for (const GList* list = pizza->m_fixed.children; list; list = list->next)
     {
     // adjust child positions
     for (const GList* list = pizza->m_fixed.children; list; list = list->next)
     {


@@ -95,7 +95,7 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
         if (GTK_WIDGET_VISIBLE(child->widget))
         {
             GtkAllocation child_old_alloc = child->widget->allocation;
         if (GTK_WIDGET_VISIBLE(child->widget))
         {
             GtkAllocation child_old_alloc = child->widget->allocation;

-        
+

             GtkAllocation child_alloc;
             // note that child positions do not take border into
             // account, they need to be relative to widget->window,
             GtkAllocation child_alloc;
             // note that child positions do not take border into
             // account, they need to be relative to widget->window,


@@ -342,7 +342,7 @@ static void scroll_adjust(GtkWidget* widget, void* data)
     const AdjustData* p = static_cast<AdjustData*>(data);
     widget->allocation.x += p->dx;
     widget->allocation.y += p->dy;
     const AdjustData* p = static_cast<AdjustData*>(data);
     widget->allocation.x += p->dx;
     widget->allocation.y += p->dy;

-    
+

     if (widget->window == p->window)
     {
         // GtkFrame requires a queue_resize, otherwise parts of
     if (widget->window == p->window)
     {
         // GtkFrame requires a queue_resize, otherwise parts of


@@ -377,24 +377,24 @@ void wxPizza::get_border_widths(int& x, int& y)
     x = y = 0;
     if (m_border_style == 0)
         return;
     x = y = 0;
     if (m_border_style == 0)
         return;

-        
+

 #ifndef __WXUNIVERSAL__
     if (m_border_style & wxBORDER_SIMPLE)
         x = y = 1;
     else if (m_is_scrollable || (m_border_style & wxBORDER_THEME))
     {
         GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();
 #ifndef __WXUNIVERSAL__
     if (m_border_style & wxBORDER_SIMPLE)
         x = y = 1;
     else if (m_is_scrollable || (m_border_style & wxBORDER_THEME))
     {
         GtkWidget *style_widget = wxGTKPrivate::GetTreeWidget();

-            
+

         if (style_widget->style)
         {
             x = style_widget->style->xthickness;
             y = style_widget->style->ythickness;
         }
     }
         if (style_widget->style)
         {
             x = style_widget->style->xthickness;
             y = style_widget->style->ythickness;
         }
     }

-    else 
+    else

     {
         GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget();
     {
         GtkWidget *style_widget = wxGTKPrivate::GetEntryWidget();

-            
+

         if (style_widget->style)
         {
             x = style_widget->style->xthickness;
         if (style_widget->style)
         {
             x = style_widget->style->xthickness;

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index a3975752f1eb3c52d1793b6ac122ee07324964d4..2e71c0bdbdc8e95a407333dd13ffc43ebe3312b1 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1833,7 +1833,7 @@ gtk_window_realized_callback(GtkWidget* widget, wxWindow* win)
         gtk_im_context_set_client_window( win->m_imData->context,
                                           widget->window);
     }
         gtk_im_context_set_client_window( win->m_imData->context,
                                           widget->window);
     }

-    
+

     // We cannot set colours and fonts before the widget
     // been realized, so we do this directly after realization
     // or otherwise in idle time
     // We cannot set colours and fonts before the widget
     // been realized, so we do this directly after realization
     // or otherwise in idle time


@@ -1964,7 +1964,7 @@ wxWindow *wxWindowBase::DoFindFocus()
 void wxWindowGTK::AddChildGTK(wxWindowGTK* child)
 {
     wxASSERT_MSG(m_wxwindow, "Cannot add a child to a window without a client area");
 void wxWindowGTK::AddChildGTK(wxWindowGTK* child)
 {
     wxASSERT_MSG(m_wxwindow, "Cannot add a child to a window without a client area");

-    
+

     // the window might have been scrolled already, we
     // have to adapt the position
     wxPizza* pizza = WX_PIZZA(m_wxwindow);
     // the window might have been scrolled already, we
     // have to adapt the position
     wxPizza* pizza = WX_PIZZA(m_wxwindow);


@@ -2443,9 +2443,9 @@ bool wxWindowGTK::Destroy()
 void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
 {
     gtk_widget_set_size_request(m_widget, width, height);
 void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
 {
     gtk_widget_set_size_request(m_widget, width, height);

-    
+

     // inform the parent to perform the move
     // inform the parent to perform the move

-    wxASSERT_MSG(m_parent && m_parent->m_wxwindow, 
+    wxASSERT_MSG(m_parent && m_parent->m_wxwindow,

                  "the parent window has no client area?");
     WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y);
 }
                  "the parent window has no client area?");
     WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y);
 }


@@ -2542,7 +2542,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
             event.SetEventObject( this );
             HandleWindowEvent( event );
         }
             event.SetEventObject( this );
             HandleWindowEvent( event );
         }

-    } else 
+    } else

     if (sizeFlags & wxSIZE_FORCE_EVENT)
     {
         wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     if (sizeFlags & wxSIZE_FORCE_EVENT)
     {
         wxSizeEvent event( wxSize(m_width,m_height), GetId() );


@@ -3599,7 +3599,7 @@ void wxWindowGTK::Update()
         gdk_display_sync(display);
 
         gdk_window_process_updates(m_widget->window, TRUE);
         gdk_display_sync(display);
 
         gdk_window_process_updates(m_widget->window, TRUE);

-        
+

         // Flush again, but no need to wait for it to finish
         gdk_display_flush(display);
     }
         // Flush again, but no need to wait for it to finish
         gdk_display_flush(display);
     }

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index a0f54cd27f7442a6ab13d1ba31be5b0c34f3644f..18d39511633a72b002fdba2b6168c8a8bd6e7150 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -203,9 +203,9 @@ void wxBitmapButton::OnSetBitmap()
 
    if (!the_one.IsOk())
      {
 
    if (!the_one.IsOk())
      {

-       the_one = GetBitmapLabel();
-       if (!the_one.IsOk())
-         return;
+         the_one = GetBitmapLabel();
+         if (!the_one.IsOk())
+             return;

      }
 
     GdkBitmap *mask = NULL;
      }
 
     GdkBitmap *mask = NULL;

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 5f3b30f9fa0c0465b026474848ced2dec65e43b6..d21b31386abdb86c2143d172da4e222b8898844a 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -848,7 +848,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     // don't start dragging if no button is down
     if (g_lastButtonNumber == 0)
         return wxDragNone;
     // don't start dragging if no button is down
     if (g_lastButtonNumber == 0)
         return wxDragNone;

-        
+

     // we can only start a drag after a mouse event
     if (g_lastMouseEvent == NULL)
         return wxDragNone;
     // we can only start a drag after a mouse event
     if (g_lastMouseEvent == NULL)
         return wxDragNone;

diff --git a/src/gtk1/main.cpp b/src/gtk1/main.cpp
index 96d7e9e4b681f4c26b12e225e004360846a8729e..d12f7cda27631b02fa7a062be1426610659ea90b 100644 (file)
--- a/src/gtk1/main.cpp
+++ b/src/gtk1/main.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index afd002c187b3db8b09e371475d335d10565974e1..e9ee469e1ed77bd4a4536a54a398d577f8974e10 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -37,7 +37,7 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
 // empty bitmap, so that we can create GtkPixmap widget:
 static char * bogus_xpm[] = {
 "2 2 1 1",
 // empty bitmap, so that we can create GtkPixmap widget:
 static char * bogus_xpm[] = {
 "2 2 1 1",

-"      c None",
+"  c None",

 "  ",
 "  "};
 
 "  ",
 "  "};
 

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 5155113810448f1a76d08d535dbe7adbc1089e7f..63b2988e614e0a26ab40d1cab624e8b85a909221 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -714,9 +714,9 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
             break;
         }
     }
             break;
         }
     }

-    
+

     int cnt = m_bookRecords.GetCount();
     int cnt = m_bookRecords.GetCount();

-    
+

     if (!has_non_ascii)
     {
       wxFileSystem fsys;
     if (!has_non_ascii)
     {
       wxFileSystem fsys;

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 63f4c1ae47e19b8b83a28221e75672a322578553..12437a80e3e1dac3c36f498122247aeb05edf703 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -100,7 +100,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
     m_HtmlHelpWin->SetController(m_helpController);
     if ( config)
         m_HtmlHelpWin->UseConfig(config, rootpath);
     m_HtmlHelpWin->SetController(m_helpController);
     if ( config)
         m_HtmlHelpWin->UseConfig(config, rootpath);

-    
+

     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
                     wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),
     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
                     wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index a661db2cc54b60febcaf38bf28276b5b7c45601b..489375df7ef1b85bed2c658c9d6d485fb8a88bc1 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -1126,7 +1126,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
 
     if (m_Border == 1)
     {
 
     if (m_Border == 1)
     {

-        // draw thin border using lines 
+        // draw thin border using lines

         wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID);
         wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID);
 
         wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID);
         wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID);
 


@@ -1138,10 +1138,10 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1);
     }
     else if (m_Border> 0)
         dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1);
     }
     else if (m_Border> 0)

-    {     
+    {

         wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID);
         wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID);
         wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID);
         wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID);

-        
+

         // draw upper left corner
         // 0---------------5
         // |              /
         // draw upper left corner
         // 0---------------5
         // |              /


@@ -1149,7 +1149,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         // | |
         // | 2
         // |/
         // | |
         // | 2
         // |/

-        // 1 
+        // 1

 
         wxPoint poly[6];
         poly[0].x =m_PosX; poly[0].y = m_PosY ;
 
         wxPoint poly[6];
         poly[0].x =m_PosX; poly[0].y = m_PosY ;


@@ -1162,7 +1162,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         dc.SetBrush(mybrush1);
         dc.SetPen(*wxTRANSPARENT_PEN);
         dc.DrawPolygon(6, poly, x, y);
         dc.SetBrush(mybrush1);
         dc.SetPen(*wxTRANSPARENT_PEN);
         dc.DrawPolygon(6, poly, x, y);

-        
+

         // draw lower right corner reusing point 1,2,4 and 5
         //                 5
         //                /|
         // draw lower right corner reusing point 1,2,4 and 5
         //                 5
         //                /|


@@ -1176,11 +1176,11 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
         poly[3].x = poly[4].x; poly[3].y = poly[2].y;
         dc.DrawPolygon(6, poly, x, y);
 
         poly[3].x = poly[4].x; poly[3].y = poly[2].y;
         dc.DrawPolygon(6, poly, x, y);
 

-        // smooth color transition like firefox 
+        // smooth color transition like firefox

         wxColour borderMediumColour(
             (m_BorderColour1.Red() + m_BorderColour2.Red()) /2 ,
             (m_BorderColour1.Green() + m_BorderColour2.Green()) /2 ,
         wxColour borderMediumColour(
             (m_BorderColour1.Red() + m_BorderColour2.Red()) /2 ,
             (m_BorderColour1.Green() + m_BorderColour2.Green()) /2 ,

-            (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2 
+            (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2

             );
         wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID);
         dc.SetPen(mypen3);
             );
         wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID);
         dc.SetPen(mypen3);

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index f564086ae49132fb56a3d2b7daa2b2fd69772967..0baea696758c1db86b40fa3c0583fb8bdf2396fe 100644 (file)
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -158,7 +158,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
         s->Read( buf.data(), size );
         *(buf.data() + size) = 0;
         wxString tmpdoc( buf, wxConvISO8859_1);
         s->Read( buf.data(), size );
         *(buf.data() + size) = 0;
         wxString tmpdoc( buf, wxConvISO8859_1);

-        
+

         wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc);
         if (charset.empty())
             doc = tmpdoc;
         wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc);
         if (charset.empty())
             doc = tmpdoc;

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index ac32fb27bf03a7f0da2c153154624adaeee0d010..cb07b1d0be345bc19853fcf03ea13f501a2f78f0 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -202,7 +202,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into

-    
+

     // we're not using GetCharWidth/Height() because of
     // differences under X and win
     wxCoord w,h;
     // we're not using GetCharWidth/Height() because of
     // differences under X and win
     wxCoord w,h;

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 68f66e43e29e625cdc08b9cd0e7c90737a964d28..4500e6ebc21eca1a20f0dc80df3ee8307ee255b2 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -246,8 +246,8 @@ wxCursor::wxCursor(const char bits[], int width, int height,
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 

-wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX,
-                  int hotSpotY )
+wxCursor::wxCursor(const wxString& name, wxBitmapType type,
+                   int hotSpotX, int hotSpotY)

 {
     // Must be an XBM file
     if (type != wxBITMAP_TYPE_XBM) {
 {
     // Must be an XBM file
     if (type != wxBITMAP_TYPE_XBM) {

diff --git a/src/motif/main.cpp b/src/motif/main.cpp
index f904fa1f1e91a61f3ba9217e9f1796fd27745e70..9a50fb1d11d01bc534c649d6f5007028a527d036 100644 (file)
--- a/src/motif/main.cpp
+++ b/src/motif/main.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // We don't put main() in the library any more. GD.
 /////////////////////////////////////////////////////////////////////////////
 
 // We don't put main() in the library any more. GD.

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 6fdcb4c5d24cbbf44a18f4d271dc125e2cd07828..1a175f9910fa9cb04eb3ffe5bf7e6ae3ab405307 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -117,7 +117,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 #endif
                 NULL);
     }
 #endif
                 NULL);
     }

-    
+

     PostCreation();
     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
 
     PostCreation();
     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
 

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 349bc1641c140d9485ab2d36eeb6adb2636b90a3..850baa8602fdf9c5286ddaa91f753cac7208d76b 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -837,7 +837,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
         return false;
 
     const bool hasAlpha = image.HasAlpha();
         return false;
 
     const bool hasAlpha = image.HasAlpha();

-    
+

     if (depth == -1)
       depth = dib.GetDepth();
 
     if (depth == -1)
       depth = dib.GetDepth();
 

diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 852fb0485a27db8623b36f4585c9cb3f9b94fe79..8e6496094a988cee3d63e0b8d9cd8748cdf236d3 100644 (file)
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -308,7 +308,7 @@ bool wxBitmapComboBox::OnAddBitmap(const wxBitmap& bitmap)
 
         return true;
     }
 
         return true;
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -365,7 +365,7 @@ bool wxBitmapComboBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     if ( pos == -1 )
         return FALSE;
 
     if ( pos == -1 )
         return FALSE;
 

-    int flags = 0;                
+    int flags = 0;

     if ( lpDrawItem->itemState & ODS_COMBOBOXEDIT )
         flags |= wxODCB_PAINTING_CONTROL;
     if ( lpDrawItem->itemState & ODS_SELECTED )
     if ( lpDrawItem->itemState & ODS_COMBOBOXEDIT )
         flags |= wxODCB_PAINTING_CONTROL;
     if ( lpDrawItem->itemState & ODS_SELECTED )

diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp
index 3fcc49f0c1b8f52c4d9f5f55d81fef25dd12fa70..cf0de6e22309ea6bcbabbd06715855ffb324ba4e 100644 (file)
--- a/src/msw/calctrl.cpp
+++ b/src/msw/calctrl.cpp
@@ -117,7 +117,7 @@ wxCalendarCtrl::Create(wxWindow *parent,
     if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
         return false;
 
     if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
         return false;
 

-    // initialize the control 
+    // initialize the control

     UpdateFirstDayOfWeek();
 
     SetDate(dt.IsValid() ? dt : wxDateTime::Today());
     UpdateFirstDayOfWeek();
 
     SetDate(dt.IsValid() ? dt : wxDateTime::Today());

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 1fac8d1ed242f5741be14949701180df7f572b20..dbefd0d91fa8b8bc68a5bbfcf5c04a1217e5ed4c 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -245,7 +245,7 @@ wxSize wxControl::DoGetBestSize() const
 {
     if (m_windowSizer)
        return wxControlBase::DoGetBestSize();
 {
     if (m_windowSizer)
        return wxControlBase::DoGetBestSize();

-       
+

     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index 75e28e8b326575957650141745c682c2d75c80d9..c84983ad851124b9e4f8c88dcdc369bdd3cc10fb 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -40,23 +40,23 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxMSWDCImpl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxMSWDCImpl)
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )

         : wxMSWDCImpl( owner )
 {
         : wxMSWDCImpl( owner )
 {

-    CreateCompatible(NULL); 
-    Init(); 
+    CreateCompatible(NULL);
+    Init();

 }
 
 }
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) 
-        : wxMSWDCImpl( owner ) 
-{ 
-    CreateCompatible(NULL); 
-    Init(); 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+        : wxMSWDCImpl( owner )
+{
+    CreateCompatible(NULL);
+    Init();

     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )
     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )

-        : wxMSWDCImpl( owner ) 
+        : wxMSWDCImpl( owner )

 {
     wxCHECK_RET( dc, wxT("NULL dc in wxMemoryDC ctor") );
 
 {
     wxCHECK_RET( dc, wxT("NULL dc in wxMemoryDC ctor") );
 

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 5404038be8c9d68a9335f934e9c4b97f5f9ccab3..d7302d23c749eda291b961b80996b4b61cf10678 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -311,7 +311,7 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;

-    
+

     // The Unix code does a similar test
     if (wxDirExists(dirname))
     {
     // The Unix code does a similar test
     if (wxDirExists(dirname))
     {


@@ -322,7 +322,7 @@ bool wxDir::Open(const wxString& dirname)
     else
     {
         m_data = NULL;
     else
     {
         m_data = NULL;

-    
+

         return false;
     }
 }
         return false;
     }
 }

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 0b6bf66a1a580e8d77774c705e0ad3d2a0206b69..6d8ecdd7c2d5bfc984a93de273dbe505da3eb4ac 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -401,7 +401,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
             if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0)
             {
                 // this msg is not going to be dispatched...
             if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0)
             {
                 // this msg is not going to be dispatched...

-                // however WM_PAINT is special: until there are damaged 
+                // however WM_PAINT is special: until there are damaged

                 // windows, Windows will keep sending it forever!
                 if (nPaintsReceived > 10)
                 {
                 // windows, Windows will keep sending it forever!
                 if (nPaintsReceived > 10)
                 {


@@ -430,9 +430,9 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
         switch (msg.message)
         {
 #if !defined(__WXWINCE__)
         switch (msg.message)
         {
 #if !defined(__WXWINCE__)

-                   case WM_NCMOUSEMOVE:
+            case WM_NCMOUSEMOVE:

 
 

-                       case WM_NCLBUTTONDOWN:
+            case WM_NCLBUTTONDOWN:

             case WM_NCLBUTTONUP:
             case WM_NCLBUTTONDBLCLK:
             case WM_NCRBUTTONDOWN:
             case WM_NCLBUTTONUP:
             case WM_NCLBUTTONDBLCLK:
             case WM_NCRBUTTONDOWN:

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 93ee67ba1959a845488bc0537f3948743e43d99a..3b5317b7c0ab769ac17a46ab60efbcb5f36439f2 100644 (file)
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -298,7 +298,7 @@ public:
     virtual void StrokePath( const wxGraphicsPath& p );
     virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
 
     virtual void StrokePath( const wxGraphicsPath& p );
     virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
 

-       // stroke lines connecting each of the points
+    // stroke lines connecting each of the points

     virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
 
     // draws a polygon
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
 
     // draws a polygon


@@ -311,7 +311,7 @@ public:
     virtual void BeginLayer(wxDouble opacity);
 
     virtual void EndLayer();
     virtual void BeginLayer(wxDouble opacity);
 
     virtual void EndLayer();

-    
+

     virtual void Translate( wxDouble dx , wxDouble dy );
     virtual void Scale( wxDouble xScale , wxDouble yScale );
     virtual void Rotate( wxDouble angle );
     virtual void Translate( wxDouble dx , wxDouble dy );
     virtual void Scale( wxDouble xScale , wxDouble yScale );
     virtual void Rotate( wxDouble angle );


@@ -1121,19 +1121,19 @@ void wxGDIPlusContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
    if (m_composition == wxCOMPOSITION_DEST)
         return;
 
    if (m_composition == wxCOMPOSITION_DEST)
         return;
 

-       if ( !m_pen.IsNull() )
-       {
-        wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
-               Point *cpoints = new Point[n];
-               for (size_t i = 0; i < n; i++)
-               {
-                       cpoints[i].X = (int)(points[i].m_x );
-                       cpoints[i].Y = (int)(points[i].m_y );
-
-               } // for (size_t i = 0; i < n; i++)
-               m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
-               delete[] cpoints;
-       }
+   if ( !m_pen.IsNull() )
+   {
+       wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
+       Point *cpoints = new Point[n];
+       for (size_t i = 0; i < n; i++)
+       {
+           cpoints[i].X = (int)(points[i].m_x );
+           cpoints[i].Y = (int)(points[i].m_y );
+
+       } // for (size_t i = 0; i < n; i++)
+       m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
+       delete[] cpoints;
+   }

 }
 
 void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode WXUNUSED(fillStyle) )
 }
 
 void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode WXUNUSED(fillStyle) )


@@ -1142,18 +1142,18 @@ void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPol
         return;
 
     wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
         return;
 
     wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );

-       Point *cpoints = new Point[n];
-       for (size_t i = 0; i < n; i++)
-       {
-               cpoints[i].X = (int)(points[i].m_x );
-               cpoints[i].Y = (int)(points[i].m_y );
+    Point *cpoints = new Point[n];
+    for (size_t i = 0; i < n; i++)
+    {
+        cpoints[i].X = (int)(points[i].m_x );
+        cpoints[i].Y = (int)(points[i].m_y );

 
 

-       } // for (int i = 0; i < n; i++)
-       if ( !m_brush.IsNull() )
-               m_context->FillPolygon( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , cpoints , n ) ;
-       if ( !m_pen.IsNull() )
-               m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
-       delete[] cpoints;
+    } // for (int i = 0; i < n; i++)
+    if ( !m_brush.IsNull() )
+        m_context->FillPolygon( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , cpoints , n ) ;
+    if ( !m_pen.IsNull() )
+        m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
+    delete[] cpoints;

 }
 
 void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )
 }
 
 void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )


@@ -1186,9 +1186,9 @@ bool wxGDIPlusContext::SetAntialiasMode(wxAntialiasMode antialias)
 {
     if (m_antialias == antialias)
         return true;
 {
     if (m_antialias == antialias)
         return true;

-    
+

     m_antialias = antialias;
     m_antialias = antialias;

-    
+

     SmoothingMode antialiasMode;
     switch (antialias)
     {
     SmoothingMode antialiasMode;
     switch (antialias)
     {


@@ -1209,9 +1209,9 @@ bool wxGDIPlusContext::SetCompositionMode(wxCompositionMode op)
 {
     if ( m_composition == op )
         return true;
 {
     if ( m_composition == op )
         return true;

-        
+

     m_composition = op;
     m_composition = op;

-    
+

     if (m_composition == wxCOMPOSITION_DEST)
         return true;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return true;
 


@@ -1240,7 +1240,7 @@ void wxGDIPlusContext::BeginLayer(wxDouble /* opacity */)
 void wxGDIPlusContext::EndLayer()
 {
     // TODO
 void wxGDIPlusContext::EndLayer()
 {
     // TODO

-}    
+}

 
 void wxGDIPlusContext::Rotate( wxDouble angle )
 {
 
 void wxGDIPlusContext::Rotate( wxDouble angle )
 {

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index a9108a1b39e955bb15f6b1461cc06f2bf7e70513..b499da63b5cda4fe00debc919b8328c307b6b887 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -247,7 +247,7 @@ bool wxImageList::Draw(int index,
     wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
     if (!msw_impl)
        return false;
     wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
     if (!msw_impl)
        return false;

-    
+

     HDC hDC = GetHdcOf(*msw_impl);
     wxCHECK_MSG( hDC, false, wxT("invalid wxDC in wxImageList::Draw") );
 
     HDC hDC = GetHdcOf(*msw_impl);
     wxCHECK_MSG( hDC, false, wxT("invalid wxDC in wxImageList::Draw") );
 

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 37189a7e65843dd6d9b0e34f20006fbfaddd312c..015b6946f4b121834f42e40cf918dd583240fd16 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -254,7 +254,7 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 void wxListBox::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 void wxListBox::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();

-    
+

     if (m_updateHorizontalExtent)
     {
         SetHorizontalExtent(wxEmptyString);
     if (m_updateHorizontalExtent)
     {
         SetHorizontalExtent(wxEmptyString);

diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index 4b978f8695d1d562528aa298cf59a11178ddfebd..e63e55038e7a75437365aab8aa765aec9d1cdce3 100644 (file)
--- a/src/msw/ole/droptgt.cpp
+++ b/src/msw/ole/droptgt.cpp
@@ -102,7 +102,7 @@ static DWORD ConvertDragResultToEffect(wxDragResult result);
 // Params  : [in] DWORD flags                 kbd & mouse flags as passed to
 //                                            IDropTarget methods
 //           [in] wxDragResult defaultAction  the default action of the drop target
 // Params  : [in] DWORD flags                 kbd & mouse flags as passed to
 //                                            IDropTarget methods
 //           [in] wxDragResult defaultAction  the default action of the drop target

-//           [in] DWORD pdwEffect             the supported actions of the drop 
+//           [in] DWORD pdwEffect             the supported actions of the drop

 //                                            source passed to IDropTarget methods
 // Notes   : We do "move" normally and "copy" if <Ctrl> is pressed,
 //           which is the standard behaviour (currently there is no
 //                                            source passed to IDropTarget methods
 // Notes   : We do "move" normally and "copy" if <Ctrl> is pressed,
 //           which is the standard behaviour (currently there is no


@@ -201,7 +201,7 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
 
     // for use in OnEnter and OnDrag calls
     m_pTarget->MSWSetDataSource(pIDataSource);
 
     // for use in OnEnter and OnDrag calls
     m_pTarget->MSWSetDataSource(pIDataSource);

-    
+

     // get hold of the data object
     m_pIDataObject = pIDataSource;
     m_pIDataObject->AddRef();
     // get hold of the data object
     m_pIDataObject = pIDataSource;
     m_pIDataObject->AddRef();

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 0092138732932c88189ee20c2552e271c8ff2897..ea2e76c0c08ce85dcf349bb5be47f926377b7eda 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -208,7 +208,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         colSys = ::GetSysColor(index);
 #endif
     }
         colSys = ::GetSysColor(index);
 #endif
     }

-    
+

     wxColour ret = wxRGBToColour(colSys);
     wxASSERT(ret.IsOk());
     return ret;
     wxColour ret = wxRGBToColour(colSys);
     wxASSERT(ret.IsOk());
     return ret;


@@ -270,7 +270,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         gs_fontDefault = new wxFont(wxCreateFontFromStockObject(SYSTEM_FONT));
     }
 
         gs_fontDefault = new wxFont(wxCreateFontFromStockObject(SYSTEM_FONT));
     }
 

-    wxASSERT(gs_fontDefault->IsOk() && 
+    wxASSERT(gs_fontDefault->IsOk() &&

              wxFontEnumerator::IsValidFacename(gs_fontDefault->GetFaceName()));
     return *gs_fontDefault;
 #else // !__WXWINCE__
              wxFontEnumerator::IsValidFacename(gs_fontDefault->GetFaceName()));
     return *gs_fontDefault;
 #else // !__WXWINCE__

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index 0ae12ccdf3cb6c5c9c6587572fb680ee3f721bdd..edadc6a1efb0d67322366d3327f6ded65ece0d6a 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -82,9 +82,9 @@ bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id,
 
     if (!wxToggleButtonBase::Create( parent, id, pos, size, style, validator, name ))
         return false;
 
     if (!wxToggleButtonBase::Create( parent, id, pos, size, style, validator, name ))
         return false;

-        
+

     m_bitmap = label;
     m_bitmap = label;

-    
+

     if (size.x == -1 || size.y == -1)
     {
         wxSize new_size = GetBestSize();
     if (size.x == -1 || size.y == -1)
     {
         wxSize new_size = GetBestSize();


@@ -94,7 +94,7 @@ bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id,
             new_size.y = size.y;
         SetSize( new_size );
     }
             new_size.y = size.y;
         SetSize( new_size );
     }

-        
+

     return true;
 }
 
     return true;
 }
 


@@ -103,7 +103,7 @@ void wxBitmapToggleButton::SetValue(bool state)
     if (m_capturing) return;
 
     if (state == m_depressed) return;
     if (m_capturing) return;
 
     if (state == m_depressed) return;

-    
+

     m_depressed = state;
     Refresh();
 }
     m_depressed = state;
     Refresh();
 }


@@ -117,7 +117,7 @@ void wxBitmapToggleButton::SetLabel(const wxBitmap& label)
 {
     m_bitmap = label;
     m_disabledBitmap = wxBitmap();
 {
     m_bitmap = label;
     m_disabledBitmap = wxBitmap();

-    
+

     Refresh();
 }
 
     Refresh();
 }
 


@@ -127,18 +127,18 @@ bool wxBitmapToggleButton::Enable(bool enable)
 
     if (!wxToggleButtonBase::Enable( enable ))
       return false;
 
     if (!wxToggleButtonBase::Enable( enable ))
       return false;

-      
+

     Refresh();
     Refresh();

-    
+

     return true;
 }
 
 void wxBitmapToggleButton::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
     wxSize size = GetSize();
     return true;
 }
 
 void wxBitmapToggleButton::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
     wxSize size = GetSize();

-    
+

     wxBitmap bitmap = m_bitmap;
     wxBitmap bitmap = m_bitmap;

-    
+

     wxPaintDC dc(this);
     wxRendererNative &renderer = wxRendererNative::Get();
     int flags = 0;
     wxPaintDC dc(this);
     wxRendererNative &renderer = wxRendererNative::Get();
     int flags = 0;


@@ -146,7 +146,7 @@ void wxBitmapToggleButton::OnPaint(wxPaintEvent &WXUNUSED(event))
         flags |= wxCONTROL_PRESSED;
     wxRect rect(0,0,size.x,size.y);
     renderer.DrawPushButton( this, dc, rect, flags );
         flags |= wxCONTROL_PRESSED;
     wxRect rect(0,0,size.x,size.y);
     renderer.DrawPushButton( this, dc, rect, flags );

-    
+

     if (bitmap.IsOk())
     {
         if (!IsEnabled())
     if (bitmap.IsOk())
     {
         if (!IsEnabled())


@@ -156,27 +156,27 @@ void wxBitmapToggleButton::OnPaint(wxPaintEvent &WXUNUSED(event))
                 wxImage image = m_bitmap.ConvertToImage();
                 m_disabledBitmap = wxBitmap( image.ConvertToGreyscale() );
             }
                 wxImage image = m_bitmap.ConvertToImage();
                 m_disabledBitmap = wxBitmap( image.ConvertToGreyscale() );
             }

-            
+

             bitmap = m_disabledBitmap;
         }
             bitmap = m_disabledBitmap;
         }

-    
+

         wxSize bsize = bitmap.GetSize();
         int offset = 0;
         if (m_depressed) offset = 1;
         dc.DrawBitmap( bitmap, (size.x-bsize.x) / 2 + offset, (size.y-bsize.y) / 2 + offset, true );
     }
         wxSize bsize = bitmap.GetSize();
         int offset = 0;
         if (m_depressed) offset = 1;
         dc.DrawBitmap( bitmap, (size.x-bsize.x) / 2 + offset, (size.y-bsize.y) / 2 + offset, true );
     }

-    
+

 }
 
 void wxBitmapToggleButton::OnMouse(wxMouseEvent &event)
 {
     if (!IsEnabled())
         return;
 }
 
 void wxBitmapToggleButton::OnMouse(wxMouseEvent &event)
 {
     if (!IsEnabled())
         return;

-      
+

     wxSize size = GetSize();
     wxSize size = GetSize();

-    bool mouse_in = ((event.GetX() > 0) && (event.GetX() < size.x) && 
+    bool mouse_in = ((event.GetX() > 0) && (event.GetX() < size.x) &&

                      (event.GetY() > 0) && (event.GetY() < size.y));
                      (event.GetY() > 0) && (event.GetY() < size.y));

-    
+

     if (m_capturing)
     {
         bool old_depressed = m_depressed;
     if (m_capturing)
     {
         bool old_depressed = m_depressed;


@@ -184,7 +184,7 @@ void wxBitmapToggleButton::OnMouse(wxMouseEvent &event)
             m_depressed = !m_oldValue;
         else
             m_depressed = m_oldValue;
             m_depressed = !m_oldValue;
         else
             m_depressed = m_oldValue;

-            
+

         if (event.LeftUp())
         {
             ReleaseCapture();
         if (event.LeftUp())
         {
             ReleaseCapture();


@@ -197,7 +197,7 @@ void wxBitmapToggleButton::OnMouse(wxMouseEvent &event)
                 ProcessCommand(event);
             }
         }
                 ProcessCommand(event);
             }
         }

-            
+

         if (old_depressed != m_depressed)
            Refresh();
     }
         if (old_depressed != m_depressed)
            Refresh();
     }


@@ -220,7 +220,7 @@ void wxBitmapToggleButton::OnChar(wxKeyEvent &event)
    {
        m_depressed = !m_depressed;
        Refresh();
    {
        m_depressed = !m_depressed;
        Refresh();

-       
+

        wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
        event.SetInt(GetValue());
        event.SetEventObject(this);
        wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
        event.SetInt(GetValue());
        event.SetEventObject(this);


@@ -237,7 +237,7 @@ wxSize wxBitmapToggleButton::DoGetBestSize() const
 {
     if (!m_bitmap.IsOk())
         return wxSize(16,16);
 {
     if (!m_bitmap.IsOk())
         return wxSize(16,16);

-      
+

     wxSize ret = m_bitmap.GetSize();
     ret.x += 8;
     ret.y += 8;
     wxSize ret = m_bitmap.GetSize();
     ret.x += 8;
     ret.y += 8;

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 5f8221238b6003eb8957be1013d166aa0cb959b3..f43fed3843e996d8ccc8339aa913b10169feb895 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -105,10 +105,10 @@ public:
         {
             // this tooltip must be shown only if the mouse hovers a specific rect
             // of the hwnd parameter!
         {
             // this tooltip must be shown only if the mouse hovers a specific rect
             // of the hwnd parameter!

-                   rect.left = rc.GetLeft();
-                   rect.right = rc.GetRight();
-                   rect.top = rc.GetTop();
-                   rect.bottom = rc.GetBottom();
+            rect.left = rc.GetLeft();
+            rect.right = rc.GetRight();
+            rect.top = rc.GetTop();
+            rect.bottom = rc.GetBottom();

 
             // note that not setting TTF_IDISHWND from the uFlags member means that the
             // ti.uId field should not contain the HWND but rather as MSDN says an
 
             // note that not setting TTF_IDISHWND from the uFlags member means that the
             // ti.uId field should not contain the HWND but rather as MSDN says an

diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index f016cd3a7b809713bd43011739ace81abff8566b..513a56f8101f6ac50c6c0619f3e1aff8fabe511d 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -437,7 +437,7 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
 bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
 {
     wxUnusedVar(flags);
 bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
 {
     wxUnusedVar(flags);

-    
+

 #if wxUSE_IPC
     if ( flags & wxBROWSER_NEW_WINDOW )
     {
 #if wxUSE_IPC
     if ( flags & wxBROWSER_NEW_WINDOW )
     {

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 1e49fa48fd8a8eab0592cb25578e5fa0969bd028..4850dd6638598cf35a205a1402728e03147f1092 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -275,7 +275,7 @@ bool wxToolMenuBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     // Skip over the menus
     if (GetMenuBar())
         pos += GetMenuBar()->GetMenuCount();
     // Skip over the menus
     if (GetMenuBar())
         pos += GetMenuBar()->GetMenuCount();

-        
+

     // the main difficulty we have here is with the controls in the toolbars:
     // as we (sometimes) use several separators to cover up the space used by
     // them, the indices are not the same for us and the toolbar
     // the main difficulty we have here is with the controls in the toolbars:
     // as we (sometimes) use several separators to cover up the space used by
     // them, the indices are not the same for us and the toolbar

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 48f804ef1e8d069113eb3673b33f1b2bf0c4a999..f8ae3d715d8b208576bcb35f47ac2ddec5581d27 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -917,7 +917,7 @@ wxImage wxBitmap::ConvertToImage() const
     // May already be selected into a PS
     //
     pDC = GetSelectedInto();
     // May already be selected into a PS
     //
     pDC = GetSelectedInto();

-    const wxPMDCImpl *impl; 
+    const wxPMDCImpl *impl;

     if (pDC != NULL &&
         (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
     {
     if (pDC != NULL &&
         (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
     {

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index 0b8cd600b5d48ce7586460ddf15d49c79f3f67ac..228e231c5f0068a3ab8705383288e05cc8858fe6 100644 (file)
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -2160,10 +2160,10 @@ void wxPMDCImpl::DoGetTextExtent(
     //
     if (!m_hPS)
     {
     //
     if (!m_hPS)
     {

-       (void)wxMessageBox( wxT("wxWidgets core library")
-                           ,"Using uninitialized DC for measuring text!\n"
-                           ,wxICON_INFORMATION
-                           );
+    (void)wxMessageBox( wxT("wxWidgets core library")
+                ,"Using uninitialized DC for measuring text!\n"
+                ,wxICON_INFORMATION
+                );

     }
 
     bRc = ::GpiQueryTextBox( m_hPS
     }
 
     bRc = ::GpiQueryTextBox( m_hPS

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 88bda87c90633dc33a4e93a35a3512db652dda43..ccddc30e764f05dad55926ad0661490b97acf332 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -29,23 +29,23 @@ IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl)
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )

         : wxPMDCImpl( owner )
 {
         : wxPMDCImpl( owner )
 {

-    CreateCompatible(NULL); 
-    Init(); 
+    CreateCompatible(NULL);
+    Init();

 }
 
 }
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) 
-        : wxPMDCImpl( owner ) 
-{ 
-    CreateCompatible(NULL); 
-    Init(); 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+        : wxPMDCImpl( owner )
+{
+    CreateCompatible(NULL);
+    Init();

     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC)
     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC)

-        : wxPMDCImpl( owner ) 
+        : wxPMDCImpl( owner )

 {
     wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") );
 
 {
     wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") );
 

diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index 01916125ea8b8cd5870d0938ee35970191b2b38d..f95901cd6ac74212d1d9c0d70d12ea7ae90a5627 100644 (file)
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -404,7 +404,7 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
     if (wxTheApp)
     {
         wxTheApp->ProcessPendingEvents();
     if (wxTheApp)
     {
         wxTheApp->ProcessPendingEvents();

-       wxTheApp->HandleSockets();
+        wxTheApp->HandleSockets();

     }
 
     //
     }
 
     //

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 51af18eca30ae32165dc9794b84ed64b2ac94e76..2c636032e0a28da4160372f0cce9c5f0e64fa28a 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -305,7 +305,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
         {
             wxOwnerDrawn*               pNewItem = CreateItem(n); // dummy argument
             wxScreenDC                  vDc; // FIXME: is it really needed here?
         {
             wxOwnerDrawn*               pNewItem = CreateItem(n); // dummy argument
             wxScreenDC                  vDc; // FIXME: is it really needed here?

-    
+

             pNewItem->SetName(items[i]);
             m_aItems.Insert(pNewItem, n);
             pNewItem->SetFont(GetFont());
             pNewItem->SetName(items[i]);
             m_aItems.Insert(pNewItem, n);
             pNewItem->SetFont(GetFont());

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 8f7d425b094be7972847ae7dd94ab654a4205d04..04cec30e3011b6d75dfd199282ed50874d9cec10 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -156,7 +156,7 @@ bool wxOwnerDrawn::OnMeasureItem( size_t* pWidth,
     // Make sure that this item is at least as
     // tall as the user's system settings specify
     //
     // Make sure that this item is at least as
     // tall as the user's system settings specify
     //

-    const size_t heightStd = 6;                 // FIXME: get value from the system
+    const size_t heightStd = 6; // FIXME: get value from the system

     if ( *pHeight < heightStd )
       *pHeight = heightStd;
     m_nHeight = *pHeight;                // remember height for use in OnDrawItem
     if ( *pHeight < heightStd )
       *pHeight = heightStd;
     m_nHeight = *pHeight;                // remember height for use in OnDrawItem

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 093e19236206e345e1a4f2b3fc18869a7a5eb0b9..adf5aab3da68a2a7b1e79ffded61e871b161f2d4 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -84,7 +84,7 @@ bool wxGetHostName( wxChar* zBuf, int nMaxSize )
     const wxChar*  zDefaultHost = wxT("noname");
 
     if ((zSysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL &&
     const wxChar*  zDefaultHost = wxT("noname");
 
     if ((zSysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL &&

-       (zSysname = wxGetenv(wxT("HOSTNAME"))) == NULL)
+            (zSysname = wxGetenv(wxT("HOSTNAME"))) == NULL)

     {
         ::PrfQueryProfileString( HINI_PROFILE
                                 ,(PSZ)WX_SECTION
     {
         ::PrfQueryProfileString( HINI_PROFILE
                                 ,(PSZ)WX_SECTION


@@ -240,14 +240,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
 static bool wxDoSetEnv(const wxString& variable, const char *value)
 {
 #if defined(HAVE_SETENV)
 static bool wxDoSetEnv(const wxString& variable, const char *value)
 {
 #if defined(HAVE_SETENV)

-    if ( !value ) 
-    { 
-#ifdef HAVE_UNSETENV 
-        return unsetenv(variable.mb_str()) == 0; 
-#else 
-        value = wxT(""); // mustn't pass NULL to setenv() 
-#endif 
-    } 
+    if ( !value )
+    {
+#ifdef HAVE_UNSETENV
+        return unsetenv(variable.mb_str()) == 0;
+#else
+        value = wxT(""); // mustn't pass NULL to setenv()
+#endif
+    }

     return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
 #elif defined(HAVE_PUTENV)
     wxString s = variable;
     return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
 #elif defined(HAVE_PUTENV)
     wxString s = variable;


@@ -474,7 +474,7 @@ bool wxGetDiskSpace(const wxString& path,
         {
            // to try to avoid 32-bit overflow, let's not multiply right away
             // (num of alloc units)
         {
            // to try to avoid 32-bit overflow, let's not multiply right away
             // (num of alloc units)

-            *pTotal = fsaBuf.cUnit;  
+            *pTotal = fsaBuf.cUnit;

             // * (num of sectors per alloc unit) * (num of bytes per sector)
             (*pTotal) *= fsaBuf.cSectorUnit * fsaBuf.cbSector;
         }
             // * (num of sectors per alloc unit) * (num of bytes per sector)
             (*pTotal) *= fsaBuf.cSectorUnit * fsaBuf.cbSector;
         }


@@ -486,7 +486,7 @@ bool wxGetDiskSpace(const wxString& path,
         return true;
     }
 }
         return true;
     }
 }

- 
+

 wxString wxPMErrorToStr(ERRORID vError)
 {
     wxString sError;
 wxString wxPMErrorToStr(ERRORID vError)
 {
     wxString sError;

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 240666554d3979560a9e6583ad40f33ceadea7b8..7a44b19018cd028220f5721bac92326c5da028a7 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -3224,7 +3224,7 @@ bool wxWindowOS2::OS2OnDrawItem( int vId,
                                           ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
                                          );
 
                                           ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
                                          );
 

-       wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+        wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();

         impl->SetHDC( hDC, false );
         impl->SetHPS( pMeasureStruct->hps );
         //
         impl->SetHDC( hDC, false );
         impl->SetHPS( pMeasureStruct->hps );
         //

diff --git a/src/osx/accel.cpp b/src/osx/accel.cpp
index 08e8140cddb001a7f010046eac9066e3e9c07930..163fcf4107ff76b3f5bbf39c0d63544f2576d5f4 100644 (file)
--- a/src/osx/accel.cpp
+++ b/src/osx/accel.cpp
@@ -95,7 +95,7 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
         if ((event.m_keyCode == entry->GetKeyCode()) &&
            (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&
         if ((event.m_keyCode == entry->GetKeyCode()) &&
            (((entry->GetFlags() & wxACCEL_CTRL) != 0) == event.ControlDown()) &&
            (((entry->GetFlags() & wxACCEL_SHIFT) != 0) == event.ShiftDown()) &&

-           (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) && 
+           (((entry->GetFlags() & wxACCEL_ALT) != 0) == event.AltDown()) &&

            (((entry->GetFlags() & wxACCEL_CMD) != 0) == event.CmdDown()))
         {
             return entry->GetCommand();
            (((entry->GetFlags() & wxACCEL_CMD) != 0) == event.CmdDown()))
         {
             return entry->GetCommand();

diff --git a/src/osx/artmac.cpp b/src/osx/artmac.cpp
index 8320c6f6a2e247e03a9dcafc3b1a5d5c191239f5..6b49934787fd15869a16148acb69f471a63c3abf 100644 (file)
--- a/src/osx/artmac.cpp
+++ b/src/osx/artmac.cpp
@@ -72,20 +72,20 @@ static wxIconBundle wxMacArtProvider_CreateIconBundle(const wxArtID& id)
     ART_MSGBOX(wxART_NORMAL_FILE, wxICON_NORMAL_FILE, deffile)
     ART_MSGBOX(wxART_EXECUTABLE_FILE, wxICON_EXECUTABLE_FILE, exefile)
 
     ART_MSGBOX(wxART_NORMAL_FILE, wxICON_NORMAL_FILE, deffile)
     ART_MSGBOX(wxART_EXECUTABLE_FILE, wxICON_EXECUTABLE_FILE, exefile)
 

-    ART_MSGBOX(wxART_CDROM,       wxICON_CDROM,       cdrom) 
-    ART_MSGBOX(wxART_FLOPPY,      wxICON_FLOPPY,      floppy) 
-    ART_MSGBOX(wxART_HARDDISK,    wxICON_HARDDISK,    harddisk) 
-    ART_MSGBOX(wxART_REMOVABLE,   wxICON_REMOVABLE,   removable) 
- 
-    ART_MSGBOX(wxART_DELETE,      wxICON_DELETE,      delete) 
- 
-    ART_MSGBOX(wxART_GO_BACK,     wxICON_GO_BACK,     back) 
-    ART_MSGBOX(wxART_GO_FORWARD,  wxICON_GO_FORWARD,  forward) 
-    ART_MSGBOX(wxART_GO_HOME,     wxICON_GO_HOME,     home) 
-
-    ART_MSGBOX(wxART_HELP_SETTINGS, wxICON_HELP_SETTINGS, htmoptns) 
-    ART_MSGBOX(wxART_HELP_PAGE,   wxICON_HELP_PAGE,   htmpage) 
-       
+    ART_MSGBOX(wxART_CDROM,       wxICON_CDROM,       cdrom)
+    ART_MSGBOX(wxART_FLOPPY,      wxICON_FLOPPY,      floppy)
+    ART_MSGBOX(wxART_HARDDISK,    wxICON_HARDDISK,    harddisk)
+    ART_MSGBOX(wxART_REMOVABLE,   wxICON_REMOVABLE,   removable)
+
+    ART_MSGBOX(wxART_DELETE,      wxICON_DELETE,      delete)
+
+    ART_MSGBOX(wxART_GO_BACK,     wxICON_GO_BACK,     back)
+    ART_MSGBOX(wxART_GO_FORWARD,  wxICON_GO_FORWARD,  forward)
+    ART_MSGBOX(wxART_GO_HOME,     wxICON_GO_HOME,     home)
+
+    ART_MSGBOX(wxART_HELP_SETTINGS, wxICON_HELP_SETTINGS, htmoptns)
+    ART_MSGBOX(wxART_HELP_PAGE,   wxICON_HELP_PAGE,   htmpage)
+

     return wxNullIconBundle;
 }
 
     return wxNullIconBundle;
 }
 

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index b831bc2bc317c6cbb52c62ebc348661aa19610eb..e413badf9713f0c125793b9afd181ff6ff8cbc79 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -835,8 +835,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     event_posted_context.perform = macPostedEventCallback;
     m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context);
     CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
     event_posted_context.perform = macPostedEventCallback;
     m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context);
     CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);

-       // run loop takes ownership
-       CFRelease(m_macEventPosted);
+    // run loop takes ownership
+    CFRelease(m_macEventPosted);

         */
     return true;
 }
         */
     return true;
 }


@@ -944,10 +944,10 @@ void wxApp::CleanUp()
 #endif
 
     if (m_macEventPosted)
 #endif
 
     if (m_macEventPosted)

-       {
-               CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
-               m_macEventPosted = NULL;
-       }
+    {
+        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
+        m_macEventPosted = NULL;
+    }

 
     DoCleanUp();
 
 
     DoCleanUp();
 


@@ -1445,7 +1445,7 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
         // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
         // and look at the character after
 #ifdef __LP64__
         // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
         // and look at the character after
 #ifdef __LP64__

-               // TODO new implementation using TextInputSources
+        // TODO new implementation using TextInputSources

 #else
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey | shiftKey | optionKey))) | keycode, &state);
 #else
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey | shiftKey | optionKey))) | keycode, &state);

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index b2f0567d2b4249d706ae0a579d9cd01d76d26582..75fd896dd05e4881c6c623640c034a105f5a688b 100644 (file)
--- a/src/osx/carbon/button.cpp
+++ b/src/osx/carbon/button.cpp
@@ -66,13 +66,13 @@ wxSize wxButton::DoGetBestSize() const
         OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 
         OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 

-        // GetThemeTextDimensions will cache strings and the documentation 
-        // says not to use the NoCopy string creation calls. 
-        // This also means that we can't use CFSTR without 
-        // -fno-constant-cfstrings if the library might be unloaded, 
-        // as GetThemeTextDimensions may cache a pointer to our 
-        // unloaded segment. 
-        wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "), 
+        // GetThemeTextDimensions will cache strings and the documentation
+        // says not to use the NoCopy string creation calls.
+        // This also means that we can't use CFSTR without
+        // -fno-constant-cfstrings if the library might be unloaded,
+        // as GetThemeTextDimensions may cache a pointer to our
+        // unloaded segment.
+        wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "),

                           GetFont().GetEncoding() );
 
 #if wxOSX_USE_ATSU_TEXT
                           GetFont().GetEncoding() );
 
 #if wxOSX_USE_ATSU_TEXT

diff --git a/src/osx/carbon/checkbox.cpp b/src/osx/carbon/checkbox.cpp
index 3dff92a7d532052cda5b6f37df866ee45825fc5c..346720b8caf80478f57ed5ccd95bfb34aa5ae68f 100644 (file)
--- a/src/osx/carbon/checkbox.cpp
+++ b/src/osx/carbon/checkbox.cpp
@@ -16,14 +16,14 @@
 #include "wx/checkbox.h"
 #include "wx/osx/uma.h"
 
 #include "wx/checkbox.h"
 #include "wx/osx/uma.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
-                                    long WXUNUSED(extraStyle)) 
+                                    long style,
+                                    long WXUNUSED(extraStyle))

 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/choice.cpp b/src/osx/carbon/choice.cpp
index 1985f812055a5a381e1395184c0cdae82ba64318..4bacff29a7072eae53c4fb35aac61ed3851e1eac 100644 (file)
--- a/src/osx/carbon/choice.cpp
+++ b/src/osx/carbon/choice.cpp
@@ -30,25 +30,25 @@ public :
     wxMacChoiceCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
     {
     }
     wxMacChoiceCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
     {
     }

-    
+

     void SetValue(wxInt32 v)
     {
         wxMacControl::SetValue( v + 1 );
     }
     void SetValue(wxInt32 v)
     {
         wxMacControl::SetValue( v + 1 );
     }

-    
+

     wxInt32 GetValue() const
     {
         return wxMacControl::GetValue() - 1;
     }
  };
 
     wxInt32 GetValue() const
     {
         return wxMacControl::GetValue() - 1;
     }
  };
 

-wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     wxMenu* menu,
                                     wxMenu* menu,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );

diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp
index 4a226c357acd92e141690270a13d524c2a825afa..6ec1b9e15a9fb637b3d7689599bf12be9ec293d8 100644 (file)
--- a/src/osx/carbon/colordlg.cpp
+++ b/src/osx/carbon/colordlg.cpp
@@ -48,13 +48,13 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 int wxColourDialog::ShowModal()
 {
     RGBColor currentColor ;
 int wxColourDialog::ShowModal()
 {
     RGBColor currentColor ;

-    
+

     m_colourData.m_dataColour.GetRGBColor( &currentColor );
     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;
     // TODO : use parent to determine better position and then kAtSpecifiedOrigin
     m_colourData.m_dataColour.GetRGBColor( &currentColor );
     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;
     // TODO : use parent to determine better position and then kAtSpecifiedOrigin

-    info.placeWhere = kCenterOnMainScreen ; 
+    info.placeWhere = kCenterOnMainScreen ;

     info.flags = kColorPickerDialogIsMoveable | kColorPickerDialogIsModal ;
     info.theColor.color.rgb.red =  currentColor.red ;
     info.theColor.color.rgb.green =  currentColor.green ;
     info.flags = kColorPickerDialogIsMoveable | kColorPickerDialogIsModal ;
     info.theColor.color.rgb.red =  currentColor.red ;
     info.theColor.color.rgb.green =  currentColor.green ;

diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp
index a3a419dc6eab14fe4bcfaebee57ca4f755c1ec29..f8223c9108a79cc04d3c43045c6b802ac8e3c570 100644 (file)
--- a/src/osx/carbon/combobox.cpp
+++ b/src/osx/carbon/combobox.cpp
@@ -150,7 +150,7 @@ protected:
 
         event.Skip();
     }
 
         event.Skip();
     }

-    
+

 private:
     wxComboBox *m_cb;
 
 private:
     wxComboBox *m_cb;
 


@@ -292,7 +292,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
         m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1);
         wxSize tSize = m_text->GetSize();
         wxSize cSize = m_choice->GetSize();
         m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1);
         wxSize tSize = m_text->GetSize();
         wxSize cSize = m_choice->GetSize();

-        
+

         int yOffset = ( tSize.y + 2 * TEXTFOCUSBORDER - cSize.y ) / 2;
 
         // put it at an inset of 1 to have outer area shadows drawn as well
         int yOffset = ( tSize.y + 2 * TEXTFOCUSBORDER - cSize.y ) / 2;
 
         // put it at an inset of 1 to have outer area shadows drawn as well


@@ -402,7 +402,7 @@ bool wxComboBox::Create(wxWindow *parent,
 }
 
 void wxComboBox::EnableTextChangedEvents(bool enable)
 }
 
 void wxComboBox::EnableTextChangedEvents(bool enable)

-{ 
+{

     if ( m_text )
         m_text->ForwardEnableTextChangedEvents(enable);
 }
     if ( m_text )
         m_text->ForwardEnableTextChangedEvents(enable);
 }

diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp
index 0086d4ade150e58177fe363a80e0061eca02ae9f..1d9d6f7f1a609ef1b7f74a6b89aee03e1d57a59a 100644 (file)
--- a/src/osx/carbon/cursor.cpp
+++ b/src/osx/carbon/cursor.cpp
@@ -654,7 +654,7 @@ void wxCursor::InitFromStock(wxStockCursor cursor_type)
     case wxCURSOR_CLOSED_HAND:
         M_CURSORDATA->m_themeCursor = kThemeClosedHandCursor;
         break;
     case wxCURSOR_CLOSED_HAND:
         M_CURSORDATA->m_themeCursor = kThemeClosedHandCursor;
         break;

-        
+

     case wxCURSOR_CHAR:
     case wxCURSOR_ARROW:
     case wxCURSOR_LEFT_BUTTON:
     case wxCURSOR_CHAR:
     case wxCURSOR_ARROW:
     case wxCURSOR_LEFT_BUTTON:

diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
index e58a05f0b5a0f7f3d76f9b294a153c03ce8ce5b4..a65b2b7dfea6fb3ed907ed44c72c5a64f8b86a7c 100644 (file)
--- a/src/osx/carbon/dataobj.cpp
+++ b/src/osx/carbon/dataobj.cpp
@@ -158,27 +158,27 @@ void wxDataFormat::SetId( NativeFormat format )
         m_format = 0;
     }
     m_format = (NativeFormat) CFStringCreateCopy(NULL, (CFStringRef)format);
         m_format = 0;
     }
     m_format = (NativeFormat) CFStringCreateCopy(NULL, (CFStringRef)format);

-    if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-plain-text") )  ) 
+    if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.utf16-plain-text") )  )

     {
         m_type = wxDF_UNICODETEXT;
     {
         m_type = wxDF_UNICODETEXT;

-    } 
+    }

     else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.plain-text") ) )
     {
         m_type = wxDF_TEXT;
     }
     else if ( UTTypeConformsTo( (CFStringRef)format, CFSTR("public.plain-text") ) )
     {
         m_type = wxDF_TEXT;
     }

-    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.tiff") )  ) 
+    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.tiff") )  )

     {
         m_type = wxDF_BITMAP;
     }
     {
         m_type = wxDF_BITMAP;
     }

-    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("com.adobe.pdf") )  ) 
+    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("com.adobe.pdf") )  )

     {
         m_type = wxDF_METAFILE;
     }
     {
         m_type = wxDF_METAFILE;
     }

-    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.file-url") )  ) 
+    else if (  UTTypeConformsTo( (CFStringRef)format, CFSTR("public.file-url") )  )

     {
         m_type = wxDF_FILENAME;
     }
     {
         m_type = wxDF_FILENAME;
     }

-    else 
+    else

     {
         m_type = wxDF_PRIVATE;
         m_id = wxCFStringRef( (CFStringRef) CFRetain((CFStringRef) format )).AsString();
     {
         m_type = wxDF_PRIVATE;
         m_id = wxCFStringRef( (CFStringRef) CFRetain((CFStringRef) format )).AsString();


@@ -253,11 +253,11 @@ void wxDataObject::AddToPasteboard( void * pb, int itemID )
     for (size_t i = 0; i < GetFormatCount(); i++)
     {
         wxDataFormat thisFormat = array[ i ];
     for (size_t i = 0; i < GetFormatCount(); i++)
     {
         wxDataFormat thisFormat = array[ i ];

-    
-        // add four bytes at the end for data objs like text that 
+
+        // add four bytes at the end for data objs like text that

         // have a datasize = strlen but still need a buffer for the
         // string including trailing zero
         // have a datasize = strlen but still need a buffer for the
         // string including trailing zero

-        
+

         size_t datasize = GetDataSize( thisFormat );
         size_t sz = datasize + 4;
         void* buf = malloc( sz );
         size_t datasize = GetDataSize( thisFormat );
         size_t sz = datasize + 4;
         void* buf = malloc( sz );


@@ -286,7 +286,7 @@ void wxDataObject::AddToPasteboard( void * pb, int itemID )
                         counter++;
                         fname = strtok (NULL,"\n");
                     }
                         counter++;
                         fname = strtok (NULL,"\n");
                     }

-                    
+

                 }
                 else
                 {
                 }
                 else
                 {


@@ -325,24 +325,24 @@ bool wxDataObject::IsFormatInPasteboard( void * pb, const wxDataFormat &dataForm
             PasteboardItemID    itemID;
             CFArrayRef          flavorTypeArray;
             CFIndex             flavorCount;
             PasteboardItemID    itemID;
             CFArrayRef          flavorTypeArray;
             CFIndex             flavorCount;

-     
+

             err = PasteboardGetItemIdentifier( pasteboard, itemIndex, &itemID );
             if ( err != noErr )
                 continue;
             err = PasteboardGetItemIdentifier( pasteboard, itemIndex, &itemID );
             if ( err != noErr )
                 continue;

-     
+

             err = PasteboardCopyItemFlavors( pasteboard, itemID, &flavorTypeArray );
             if ( err != noErr )
                 continue;
             err = PasteboardCopyItemFlavors( pasteboard, itemID, &flavorTypeArray );
             if ( err != noErr )
                 continue;

-     
+

             flavorCount = CFArrayGetCount( flavorTypeArray );
             flavorCount = CFArrayGetCount( flavorTypeArray );

-     
+

             for( CFIndex flavorIndex = 0; flavorIndex < flavorCount && hasData == false ; flavorIndex++ )
             {
                 CFStringRef             flavorType;
             for( CFIndex flavorIndex = 0; flavorIndex < flavorCount && hasData == false ; flavorIndex++ )
             {
                 CFStringRef             flavorType;

-     
+

                 flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray,
                                                                      flavorIndex );
                 flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray,
                                                                      flavorIndex );

-                     
+

                 wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType );
                 if ( dataFormat == flavorFormat )
                     hasData = true;
                 wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType );
                 if ( dataFormat == flavorFormat )
                     hasData = true;


@@ -391,7 +391,7 @@ bool wxDataObject::GetFromPasteboard( void * pb )
                 err = PasteboardCopyItemFlavors( pasteboard, itemID, &flavorTypeArray );
                 if ( err != noErr )
                     continue;
                 err = PasteboardCopyItemFlavors( pasteboard, itemID, &flavorTypeArray );
                 if ( err != noErr )
                     continue;

-                    
+

                 flavorCount = CFArrayGetCount( flavorTypeArray );
 
                 for( CFIndex flavorIndex = 0; !transferred && flavorIndex < flavorCount ; flavorIndex++ )
                 flavorCount = CFArrayGetCount( flavorTypeArray );
 
                 for( CFIndex flavorIndex = 0; !transferred && flavorIndex < flavorCount ; flavorIndex++ )


@@ -399,7 +399,7 @@ bool wxDataObject::GetFromPasteboard( void * pb )
                     CFStringRef             flavorType;
                     CFDataRef               flavorData;
                     CFIndex                 flavorDataSize;
                     CFStringRef             flavorType;
                     CFDataRef               flavorData;
                     CFIndex                 flavorDataSize;

-         
+

                     flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray,
                                                                          flavorIndex );
 
                     flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray,
                                                                          flavorIndex );
 


@@ -409,7 +409,7 @@ bool wxDataObject::GetFromPasteboard( void * pb )
                         flavorType = CFSTR("public.utf16-plain-text");
                     }
                     wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType );
                         flavorType = CFSTR("public.utf16-plain-text");
                     }
                     wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType );

- 
+

                     if ( dataFormat == flavorFormat )
                     {
                         err = PasteboardCopyItemFlavorData( pasteboard, itemID, flavorType , &flavorData );
                     if ( dataFormat == flavorFormat )
                     {
                         err = PasteboardCopyItemFlavorData( pasteboard, itemID, flavorType , &flavorData );


@@ -437,7 +437,7 @@ bool wxDataObject::GetFromPasteboard( void * pb )
                                 {
                                     memset( buf, 0, flavorDataSize + 4 );
                                     memcpy( buf, CFDataGetBytePtr( flavorData ), flavorDataSize );
                                 {
                                     memset( buf, 0, flavorDataSize + 4 );
                                     memcpy( buf, CFDataGetBytePtr( flavorData ), flavorDataSize );

- 
+

                                     if (dataFormat.GetType() == wxDF_TEXT)
                                         wxMacConvertNewlines10To13( (char*) buf );
                                     SetData( flavorFormat, flavorDataSize, buf );
                                     if (dataFormat.GetType() == wxDF_TEXT)
                                         wxMacConvertNewlines10To13( (char*) buf );
                                     SetData( flavorFormat, flavorDataSize, buf );


@@ -517,19 +517,19 @@ bool wxDataObject::HasDataInPasteboard( void * pb )
                 err = PasteboardCopyItemFlavors( pasteboard, itemID, &flavorTypeArray );
                 if ( err != noErr )
                     continue;
                 err = PasteboardCopyItemFlavors( pasteboard, itemID, &flavorTypeArray );
                 if ( err != noErr )
                     continue;

-                    
+

                 flavorCount = CFArrayGetCount( flavorTypeArray );
 
                 for( CFIndex flavorIndex = 0; !hasData && flavorIndex < flavorCount ; flavorIndex++ )
                 {
                     CFStringRef             flavorType;
                 flavorCount = CFArrayGetCount( flavorTypeArray );
 
                 for( CFIndex flavorIndex = 0; !hasData && flavorIndex < flavorCount ; flavorIndex++ )
                 {
                     CFStringRef             flavorType;

-          
+

                     flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray,
                                                                          flavorIndex );
 
                     wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType );
                     flavorType = (CFStringRef)CFArrayGetValueAtIndex( flavorTypeArray,
                                                                          flavorIndex );
 
                     wxDataFormat flavorFormat( (wxDataFormat::NativeFormat) flavorType );

- 
-                    if ( dataFormat == flavorFormat || 
+
+                    if ( dataFormat == flavorFormat ||

                         dataFormat.GetType() == wxDF_UNICODETEXT && flavorFormat.GetType() == wxDF_TEXT )
                     {
                         hasData = true;
                         dataFormat.GetType() == wxDF_UNICODETEXT && flavorFormat.GetType() == wxDF_TEXT )
                     {
                         hasData = true;


@@ -634,7 +634,7 @@ wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& rBitmap )
 
     if (m_bitmap.Ok())
     {
 
     if (m_bitmap.Ok())
     {

-               SetBitmap( rBitmap );
+        SetBitmap( rBitmap );

     }
 }
 
     }
 }
 

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index dbb38514bfd1dad132d9d844c49547b23ecac36c..b48290c53878e312d55553395f6ef3fa48f22bef 100644 (file)
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -353,9 +353,9 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee
   callbacks.u.v1.itemDataCallback          = gDataBrowserTableViewItemDataUPP;
   callbacks.u.v1.itemCompareCallback       = gDataBrowserTableViewItemCompareUPP;
   callbacks.u.v1.itemNotificationCallback  = gDataBrowserTableViewItemNotificationUPP;
   callbacks.u.v1.itemDataCallback          = gDataBrowserTableViewItemDataUPP;
   callbacks.u.v1.itemCompareCallback       = gDataBrowserTableViewItemCompareUPP;
   callbacks.u.v1.itemNotificationCallback  = gDataBrowserTableViewItemNotificationUPP;

-       callbacks.u.v1.acceptDragCallback        = gDataBrowserTableViewAcceptDragUPP;
-       callbacks.u.v1.addDragItemCallback       = gDataBrowserTableViewAddDragItemUPP;
-       callbacks.u.v1.receiveDragCallback       = gDataBrowserTableViewReceiveDragUPP;
+  callbacks.u.v1.acceptDragCallback        = gDataBrowserTableViewAcceptDragUPP;
+  callbacks.u.v1.addDragItemCallback       = gDataBrowserTableViewAddDragItemUPP;
+  callbacks.u.v1.receiveDragCallback       = gDataBrowserTableViewReceiveDragUPP;

   this->SetCallbacks(&callbacks);
 
  // setup callbacks for customized items:
   this->SetCallbacks(&callbacks);
 
  // setup callbacks for customized items:

diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index 6d3d5de47be5517dd87413fbc8e08d7b690f394b..663640741cd7e5b2c27f969977f85ff032f9954e 100644 (file)
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -45,7 +45,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window )
    : wxGCDCImpl( owner )
 {
     m_window = window;
    : wxGCDCImpl( owner )
 {
     m_window = window;

-    
+

     m_ok = true ;
 
     m_window->GetSize( &m_width , &m_height);
     m_ok = true ;
 
     m_window->GetSize( &m_width , &m_height);


@@ -107,7 +107,7 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     ControlRef handle = (ControlRef) m_window->GetHandle();
     if ( !handle )
         return wxNullBitmap;
     ControlRef handle = (ControlRef) m_window->GetHandle();
     if ( !handle )
         return wxNullBitmap;

-    
+

     HIRect rect;
     CGImageRef image;
     CGContextRef context;
     HIRect rect;
     CGImageRef image;
     CGContextRef context;


@@ -119,11 +119,11 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     int height = subrect !=  NULL ? subrect->height : (int)rect.size.height ;
 
     wxBitmap bmp = wxBitmap(width, height, 32);
     int height = subrect !=  NULL ? subrect->height : (int)rect.size.height ;
 
     wxBitmap bmp = wxBitmap(width, height, 32);

-    
+

     context = (CGContextRef)bmp.GetHBITMAP();
     context = (CGContextRef)bmp.GetHBITMAP();

-    
+

     CGContextSaveGState(context);
     CGContextSaveGState(context);

-    
+

     CGContextTranslateCTM( context, 0,  height );
     CGContextScaleCTM( context, 1, -1 );
 
     CGContextTranslateCTM( context, 0,  height );
     CGContextScaleCTM( context, 1, -1 );
 

diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp
index 9dfcfef8701d014866b642963907c4a6eaa0077b..6bb57f78b340ca1100e5fe4468a5d0f2ce42eeb6 100644 (file)
--- a/src/osx/carbon/dcscreen.cpp
+++ b/src/osx/carbon/dcscreen.cpp
@@ -36,7 +36,7 @@ wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
     m_width = (wxCoord)cgbounds.size.width;
     m_height = (wxCoord)cgbounds.size.height;
 #else
     m_width = (wxCoord)cgbounds.size.width;
     m_height = (wxCoord)cgbounds.size.height;
 #else

-       wxDisplaySize( &m_width, &m_height );
+    wxDisplaySize( &m_width, &m_height );

 #endif
 #if wxOSX_USE_COCOA_OR_IPHONE
     SetGraphicsContext( wxGraphicsContext::Create() );
 #endif
 #if wxOSX_USE_COCOA_OR_IPHONE
     SetGraphicsContext( wxGraphicsContext::Create() );


@@ -76,21 +76,21 @@ wxBitmap wxScreenDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     CGRect srcRect = CGRectMake(rect.x, rect.y, rect.width, rect.height);
 
     CGContextRef context = (CGContextRef)bmp.GetHBITMAP();
     CGRect srcRect = CGRectMake(rect.x, rect.y, rect.width, rect.height);
 
     CGContextRef context = (CGContextRef)bmp.GetHBITMAP();

-    
+

     CGContextSaveGState(context);
     CGContextSaveGState(context);

-    
+

     CGContextTranslateCTM( context, 0,  m_height );
     CGContextScaleCTM( context, 1, -1 );
     CGContextTranslateCTM( context, 0,  m_height );
     CGContextScaleCTM( context, 1, -1 );

-    
+

     if ( subrect )
         srcRect = CGRectOffset( srcRect, -subrect->x, -subrect->y ) ;
     if ( subrect )
         srcRect = CGRectOffset( srcRect, -subrect->x, -subrect->y ) ;

-    
+

     CGImageRef image = grabViaOpenGL(kCGNullDirectDisplay, srcRect);
     CGImageRef image = grabViaOpenGL(kCGNullDirectDisplay, srcRect);

-    
+

     wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));
     wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));

-    
+

     CGContextDrawImage(context, srcRect, image);
     CGContextDrawImage(context, srcRect, image);

-    
+

     CGContextRestoreGState(context);
 #endif
     return bmp;
     CGContextRestoreGState(context);
 #endif
     return bmp;

diff --git a/src/osx/carbon/dirdlg.cpp b/src/osx/carbon/dirdlg.cpp
index 157e07845d3dd2340de948527264266d3cf6d47e..c653e17e20ddd83e25a9fe867dc26c6b2e1eecd0 100644 (file)
--- a/src/osx/carbon/dirdlg.cpp
+++ b/src/osx/carbon/dirdlg.cpp
@@ -132,8 +132,8 @@ int wxDirDialog::ShowModal()
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
 
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
 

-       if ( dialog )
-       ::NavDialogDispose(dialog);
+    if ( dialog )
+        ::NavDialogDispose(dialog);

 
     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }

diff --git a/src/osx/carbon/dirmac.cpp b/src/osx/carbon/dirmac.cpp
index 1fabdec5cd80aa30800b812751b14b9f7d6cd39e..6ac3a147f54ed2e3b127e2898ecb654dfefadbe7 100644 (file)
--- a/src/osx/carbon/dirmac.cpp
+++ b/src/osx/carbon/dirmac.cpp
@@ -135,9 +135,9 @@ bool wxDirData::Read(wxString *filename)
         ItemCount fetched = 0;
 
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
         ItemCount fetched = 0;
 
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );

-        
-        // expected error codes 
-        
+
+        // expected error codes
+

         if ( errFSNoMoreItems == err )
             return false ;
         if ( afpAccessDenied == err )
         if ( errFSNoMoreItems == err )
             return false ;
         if ( afpAccessDenied == err )

diff --git a/src/osx/carbon/dnd.cpp b/src/osx/carbon/dnd.cpp
index 22036c22ace8efcdaf2de63894fafb37dbb01d54..5ece3e0d090923140b46e882f5d54159a24abc65 100644 (file)
--- a/src/osx/carbon/dnd.cpp
+++ b/src/osx/carbon/dnd.cpp
@@ -59,7 +59,7 @@ wxDragResult wxDropTarget::OnDragOver(
 
 wxDataFormat wxDropTarget::GetMatchingPair()
 {
 
 wxDataFormat wxDropTarget::GetMatchingPair()
 {

-    wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/osx/carbon/dnd.cpp"); 
+    wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/osx/carbon/dnd.cpp");

     return wxDF_INVALID;
 }
 
     return wxDF_INVALID;
 }
 


@@ -391,121 +391,121 @@ pascal OSErr wxMacWindowDragTrackingHandler(
                 break;
 
             GetDragMouse( theDrag, &mouse, 0L );
                 break;
 
             GetDragMouse( theDrag, &mouse, 0L );

-                       {
-                               int x = mouse.h ;
-                               int y = mouse.v ;
-                               toplevel->GetNonOwnedPeer()->ScreenToWindow( &x, &y );
-                               localMouse.h = x;
-                               localMouse.v = y;
-
-                               {
-                                       wxWindow *win = NULL;
-                                       ControlPartCode controlPart;
-                                       ControlRef control = FindControlUnderMouse( localMouse, theWindow, &controlPart );
-                                       if ( control )
-                                               win = wxFindWindowFromWXWidget( (WXWidget) control );
-                                       else
-                                               win = toplevel;
-
-                                       int localx, localy;
-                                       localx = localMouse.h;
-                                       localy = localMouse.v;
-
-                                       if ( win )
-                                               win->MacRootWindowToWindow( &localx, &localy );
-                                       if ( win != trackingGlobals->m_currentTargetWindow )
-                                       {
-                                               if ( trackingGlobals->m_currentTargetWindow )
-                                               {
-                                                       // this window is left
-                                                       if ( trackingGlobals->m_currentTarget )
-                                                       {
-       #ifndef __LP64__
-                                                               HideDragHilite( theDrag );
-       #endif
-                                                               trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
-                                                               trackingGlobals->m_currentTarget->OnLeave();
-                                                               trackingGlobals->m_currentTarget = NULL;
-                                                               trackingGlobals->m_currentTargetWindow = NULL;
-                                                       }
-                                               }
-
-                                               if ( win )
-                                               {
-                                                       // this window is entered
-                                                       trackingGlobals->m_currentTargetWindow = win;
-                                                       trackingGlobals->m_currentTarget = win->GetDropTarget();
-                                                       {
-                                                               if ( trackingGlobals->m_currentTarget )
-                                                               {
-                                                                       trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
-                                                                       result = trackingGlobals->m_currentTarget->OnEnter( localx, localy, result );
-                                                               }
-
-                                                               if ( result != wxDragNone )
-                                                               {
-                                                                       int x, y;
-
-                                                                       x = y = 0;
-                                                                       win->MacWindowToRootWindow( &x, &y );
-                                                                       RgnHandle hiliteRgn = NewRgn();
-                                                                       Rect r = { y, x, y + win->GetSize().y, x + win->GetSize().x };
-                                                                       RectRgn( hiliteRgn, &r );
-       #ifndef __LP64__
-                                                                       ShowDragHilite( theDrag, hiliteRgn, true );
-       #endif
-                                                                       DisposeRgn( hiliteRgn );
-                                                               }
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               if ( trackingGlobals->m_currentTarget )
-                                               {
-                                                       trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
-                                                       result = trackingGlobals->m_currentTarget->OnDragOver( localx, localy, result );
-                                               }
-                                       }
-
-                                       // set cursor for OnEnter and OnDragOver
-                                       if ( trackingGlobals->m_currentSource && !trackingGlobals->m_currentSource->GiveFeedback( result ) )
-                                       {
-                                         if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) )
-                                         {
-                                                 wxStockCursor cursorID = wxCURSOR_NONE;
-
-                                                 switch (result)
-                                                 {
-                                                         case wxDragCopy:
-                                                                 cursorID = wxCURSOR_COPY_ARROW;
-                                                                 break;
-
-                                                         case wxDragMove:
-                                                                 cursorID = wxCURSOR_ARROW;
-                                                                 break;
-
-                                                         case wxDragNone:
-                                                                 cursorID = wxCURSOR_NO_ENTRY;
-                                                                 break;
-
-                                                         case wxDragError:
-                                                         case wxDragLink:
-                                                         case wxDragCancel:
-                                                         default:
-                                                                 // put these here to make gcc happy
-                                                                 ;
-                                                 }
-
-                                                 if (cursorID != wxCURSOR_NONE)
-                                                 {
-                                                         wxCursor cursor( cursorID );
-                                                         cursor.MacInstall();
-                                                 }
-                                          }
-                                       }
-                               }
-                       }
+            {
+                int x = mouse.h ;
+                int y = mouse.v ;
+                toplevel->GetNonOwnedPeer()->ScreenToWindow( &x, &y );
+                localMouse.h = x;
+                localMouse.v = y;
+
+                {
+                    wxWindow *win = NULL;
+                    ControlPartCode controlPart;
+                    ControlRef control = FindControlUnderMouse( localMouse, theWindow, &controlPart );
+                    if ( control )
+                        win = wxFindWindowFromWXWidget( (WXWidget) control );
+                    else
+                        win = toplevel;
+
+                    int localx, localy;
+                    localx = localMouse.h;
+                    localy = localMouse.v;
+
+                    if ( win )
+                        win->MacRootWindowToWindow( &localx, &localy );
+                    if ( win != trackingGlobals->m_currentTargetWindow )
+                    {
+                        if ( trackingGlobals->m_currentTargetWindow )
+                        {
+                            // this window is left
+                            if ( trackingGlobals->m_currentTarget )
+                            {
+#ifndef __LP64__
+                                HideDragHilite( theDrag );
+#endif
+                                trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
+                                trackingGlobals->m_currentTarget->OnLeave();
+                                trackingGlobals->m_currentTarget = NULL;
+                                trackingGlobals->m_currentTargetWindow = NULL;
+                            }
+                        }
+
+                        if ( win )
+                        {
+                            // this window is entered
+                            trackingGlobals->m_currentTargetWindow = win;
+                            trackingGlobals->m_currentTarget = win->GetDropTarget();
+                            {
+                                if ( trackingGlobals->m_currentTarget )
+                                {
+                                    trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
+                                    result = trackingGlobals->m_currentTarget->OnEnter( localx, localy, result );
+                                }
+
+                                if ( result != wxDragNone )
+                                {
+                                    int x, y;
+
+                                    x = y = 0;
+                                    win->MacWindowToRootWindow( &x, &y );
+                                    RgnHandle hiliteRgn = NewRgn();
+                                    Rect r = { y, x, y + win->GetSize().y, x + win->GetSize().x };
+                                    RectRgn( hiliteRgn, &r );
+#ifndef __LP64__
+                                    ShowDragHilite( theDrag, hiliteRgn, true );
+#endif
+                                    DisposeRgn( hiliteRgn );
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if ( trackingGlobals->m_currentTarget )
+                        {
+                            trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
+                            result = trackingGlobals->m_currentTarget->OnDragOver( localx, localy, result );
+                        }
+                    }
+
+                    // set cursor for OnEnter and OnDragOver
+                    if ( trackingGlobals->m_currentSource && !trackingGlobals->m_currentSource->GiveFeedback( result ) )
+                    {
+                        if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) )
+                        {
+                            wxStockCursor cursorID = wxCURSOR_NONE;
+
+                            switch (result)
+                            {
+                                case wxDragCopy:
+                                    cursorID = wxCURSOR_COPY_ARROW;
+                                    break;
+
+                                case wxDragMove:
+                                    cursorID = wxCURSOR_ARROW;
+                                    break;
+
+                                case wxDragNone:
+                                    cursorID = wxCURSOR_NO_ENTRY;
+                                    break;
+
+                                case wxDragError:
+                                case wxDragLink:
+                                case wxDragCancel:
+                                default:
+                                    // put these here to make gcc happy
+                                    ;
+                            }
+
+                            if (cursorID != wxCURSOR_NONE)
+                            {
+                                wxCursor cursor( cursorID );
+                                cursor.MacInstall();
+                            }
+                        }
+                    }
+                }
+            }

             break;
 
         case kDragTrackingLeaveWindow:
             break;
 
         case kDragTrackingLeaveWindow:

diff --git a/src/osx/carbon/drawer.cpp b/src/osx/carbon/drawer.cpp
index 06ad62df5027b31566b87acff6f776cc999279e1..2bd0d8041b080dda7fd008b84044c6cebceec2c5 100644 (file)
--- a/src/osx/carbon/drawer.cpp
+++ b/src/osx/carbon/drawer.cpp
@@ -140,7 +140,7 @@ bool wxDrawerWindow::SetPreferredEdge(wxDirection edge)
 {
     const OSStatus status = ::SetDrawerPreferredEdge((WindowRef)GetWXWindow(),
      DirectionToWindowEdge(edge));
 {
     const OSStatus status = ::SetDrawerPreferredEdge((WindowRef)GetWXWindow(),
      DirectionToWindowEdge(edge));

-       return (noErr == status);
+    return (noErr == status);

 }
 
 
 }
 
 

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index c37e0c8f1e72c35fdd426f660bcd759d4504fbb9..8ee911dc85ee807589cbf2f6fee1c95bd154a91c 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -50,14 +50,14 @@ public:
     }
 
     wxFontRefData(const wxFontRefData& data);
     }
 
     wxFontRefData(const wxFontRefData& data);

-    
+

     wxFontRefData( const wxNativeFontInfo& info ) : m_info(info)
     {
         Init();
     }
 
     wxFontRefData(wxOSXSystemFont font, int size);
     wxFontRefData( const wxNativeFontInfo& info ) : m_info(info)
     {
         Init();
     }
 
     wxFontRefData(wxOSXSystemFont font, int size);

-    
+

 #if wxOSX_USE_CORE_TEXT
     wxFontRefData( wxUint32 coreTextFontType );
     wxFontRefData( CTFontRef font );
 #if wxOSX_USE_CORE_TEXT
     wxFontRefData( wxUint32 coreTextFontType );
     wxFontRefData( CTFontRef font );


@@ -196,7 +196,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
 #endif
 #if wxOSX_USE_CORE_TEXT
     m_ctFont = data.m_ctFont;
 #endif
 #if wxOSX_USE_CORE_TEXT
     m_ctFont = data.m_ctFont;

-#endif 
+#endif

     m_cgFont = data.m_cgFont;
 #if wxOSX_USE_ATSU_TEXT
     if ( data.m_macATSUStyle != NULL )
     m_cgFont = data.m_cgFont;
 #if wxOSX_USE_ATSU_TEXT
     if ( data.m_macATSUStyle != NULL )


@@ -211,7 +211,7 @@ wxFontRefData::wxFontRefData(const wxFontRefData& data)
 #if wxOSX_USE_IPHONE
     m_uiFont = (UIFont*) wxMacCocoaRetain(data.m_uiFont);
 #endif
 #if wxOSX_USE_IPHONE
     m_uiFont = (UIFont*) wxMacCocoaRetain(data.m_uiFont);
 #endif

-    
+

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -282,7 +282,7 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
 {
     wxASSERT( font != wxOSX_SYSTEM_FONT_NONE );
     Init();
 {
     wxASSERT( font != wxOSX_SYSTEM_FONT_NONE );
     Init();

-    
+

 #if wxOSX_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )
     {
 #if wxOSX_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )
     {


@@ -356,14 +356,14 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
                 m_macThemeFontID = kThemeViewsFont;
                 break;
             default:
                 m_macThemeFontID = kThemeViewsFont;
                 break;
             default:

-                break;                
+                break;

         }
         if ( m_info.m_faceName.empty() )
         {
             Style style ;
             FMFontSize fontSize;
             Str255 qdFontName ;
         }
         if ( m_info.m_faceName.empty() )
         {
             Style style ;
             FMFontSize fontSize;
             Str255 qdFontName ;

-            
+

             GetThemeFont( m_macThemeFontID, GetApplicationScript(), qdFontName, &fontSize, &style );
             if ( size != 0 )
                 fontSize = size;
             GetThemeFont( m_macThemeFontID, GetApplicationScript(), qdFontName, &fontSize, &style );
             if ( size != 0 )
                 fontSize = size;


@@ -371,7 +371,7 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
             wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
             wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
             bool underlined = false;
             wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
             wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
             bool underlined = false;

-            
+

             if ( style & bold )
                 fontweight = wxFONTWEIGHT_BOLD ;
             else
             if ( style & bold )
                 fontweight = wxFONTWEIGHT_BOLD ;
             else


@@ -380,7 +380,7 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
                 fontstyle = wxFONTSTYLE_ITALIC ;
             if ( style & underline )
                 underlined = true ;
                 fontstyle = wxFONTSTYLE_ITALIC ;
             if ( style & underline )
                 underlined = true ;

-                
+

             m_info.Init(fontSize,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
                 wxMacMakeStringFromPascal( qdFontName ), wxFONTENCODING_DEFAULT);
          }
             m_info.Init(fontSize,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
                 wxMacMakeStringFromPascal( qdFontName ), wxFONTENCODING_DEFAULT);
          }


@@ -398,9 +398,9 @@ void wxFontRefData::MacFindFont()
 {
     if ( m_fontValid )
         return;
 {
     if ( m_fontValid )
         return;

-        
+

     m_info.EnsureValid();
     m_info.EnsureValid();

-    
+

 #if wxOSX_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )
     {
 #if wxOSX_USE_CORE_TEXT
     if (  UMAGetSystemVersion() >= 0x1050 )
     {


@@ -501,10 +501,10 @@ void wxFontRefData::MacFindFont()
 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     UnRef();
 bool wxFont::Create(const wxNativeFontInfo& info)
 {
     UnRef();

-    
+

     m_refData = new wxFontRefData( info );
     RealizeResource();
     m_refData = new wxFontRefData( info );
     RealizeResource();

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -524,7 +524,7 @@ bool wxFont::Create(int pointSize,
                     wxFontEncoding encoding)
 {
     UnRef();
                     wxFontEncoding encoding)
 {
     UnRef();

-    
+

     wxString faceName = faceNameParam;
 
     if ( faceName.empty() )
     wxString faceName = faceNameParam;
 
     if ( faceName.empty() )


@@ -534,7 +534,7 @@ bool wxFont::Create(int pointSize,
             case wxFONTFAMILY_DEFAULT :
                 faceName = wxT("Lucida Grande");
                 break;
             case wxFONTFAMILY_DEFAULT :
                 faceName = wxT("Lucida Grande");
                 break;

-                
+

             case wxFONTFAMILY_SCRIPT :
             case wxFONTFAMILY_ROMAN :
             case wxFONTFAMILY_DECORATIVE :
             case wxFONTFAMILY_SCRIPT :
             case wxFONTFAMILY_ROMAN :
             case wxFONTFAMILY_DECORATIVE :


@@ -555,9 +555,9 @@ bool wxFont::Create(int pointSize,
                 break ;
         }
     }
                 break ;
         }
     }

-    
+

     wxNativeFontInfo info;
     wxNativeFontInfo info;

-    
+

     info.Init(pointSize, family, style, weight,
         underlined, faceName, encoding);
 
     info.Init(pointSize, family, style, weight,
         underlined, faceName, encoding);
 


@@ -569,9 +569,9 @@ bool wxFont::Create(int pointSize,
 bool wxFont::CreateSystemFont(wxOSXSystemFont font)
 {
     UnRef();
 bool wxFont::CreateSystemFont(wxOSXSystemFont font)
 {
     UnRef();

-    
+

     m_refData = new wxFontRefData( font, 0 );
     m_refData = new wxFontRefData( font, 0 );

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -582,7 +582,7 @@ wxFont::~wxFont()
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 {
     UnRef();
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 {
     UnRef();

-    
+

     m_refData = new wxFontRefData( info);
 }
 
     m_refData = new wxFontRefData( info);
 }
 


@@ -750,7 +750,7 @@ short wxFont::MacGetFontNum() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return M_FONTDATA->m_info.m_qdFontFamily;
 }
 
     return M_FONTDATA->m_info.m_qdFontFamily;
 }
 


@@ -760,7 +760,7 @@ wxByte wxFont::MacGetFontStyle() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return M_FONTDATA->m_info.m_qdFontStyle;
 }
 
     return M_FONTDATA->m_info.m_qdFontStyle;
 }
 


@@ -780,18 +780,18 @@ void * wxFont::MacGetATSUStyle() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return M_FONTDATA->m_macATSUStyle;
 }
 
 #if WXWIN_COMPATIBILITY_2_8
     return M_FONTDATA->m_macATSUStyle;
 }
 
 #if WXWIN_COMPATIBILITY_2_8

-wxUint32 wxFont::MacGetATSUFontID() const 
+wxUint32 wxFont::MacGetATSUFontID() const

 {
     wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") );
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 {
     wxCHECK_MSG( M_FONTDATA != NULL, 0, wxT("invalid font") );
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return M_FONTDATA->m_info.m_atsuFontID;
 }
 
     return M_FONTDATA->m_info.m_atsuFontID;
 }
 


@@ -801,7 +801,7 @@ wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return M_FONTDATA->m_info.m_atsuAdditionalQDStyles;
 }
 #endif
     return M_FONTDATA->m_info.m_atsuAdditionalQDStyles;
 }
 #endif


@@ -816,7 +816,7 @@ CTFontRef wxFont::OSXGetCTFont() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return (CTFontRef)(M_FONTDATA->m_ctFont);
 }
 
     return (CTFontRef)(M_FONTDATA->m_ctFont);
 }
 


@@ -830,7 +830,7 @@ CGFontRef wxFont::OSXGetCGFont() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return (M_FONTDATA->m_cgFont);
 }
 
     return (M_FONTDATA->m_cgFont);
 }
 


@@ -845,7 +845,7 @@ NSFont* wxFont::OSXGetNSFont() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     return (M_FONTDATA->m_nsFont);
 }
 
     return (M_FONTDATA->m_nsFont);
 }
 


@@ -858,7 +858,7 @@ const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();
 
     // cast away constness otherwise lazy font resolution is not possible
     const_cast<wxFont *>(this)->RealizeResource();

-    
+

     // M_FONTDATA->m_info.InitFromFont(*this);
 
     return &(M_FONTDATA->m_info);
     // M_FONTDATA->m_info.InitFromFont(*this);
 
     return &(M_FONTDATA->m_info);


@@ -958,7 +958,7 @@ void wxNativeFontInfo::Init(CTFontDescriptorRef descr)
 {
     Init();
     m_ctFontDescriptor = wxCFRetain(descr);
 {
     Init();
     m_ctFontDescriptor = wxCFRetain(descr);

-    
+

     wxCFRef< CFNumberRef > sizevalue( (CFNumberRef) CTFontDescriptorCopyAttribute( m_ctFontDescriptor, kCTFontSizeAttribute ) );
     float fsize;
     if ( CFNumberGetValue( sizevalue , kCFNumberFloatType , &fsize ) )
     wxCFRef< CFNumberRef > sizevalue( (CFNumberRef) CTFontDescriptorCopyAttribute( m_ctFontDescriptor, kCTFontSizeAttribute ) );
     float fsize;
     if ( CFNumberGetValue( sizevalue , kCFNumberFloatType , &fsize ) )


@@ -975,7 +975,7 @@ void wxNativeFontInfo::Init(CTFontDescriptorRef descr)
     }
 
     wxCFStringRef familyName( (CFStringRef) CTFontDescriptorCopyAttribute(m_ctFontDescriptor, kCTFontFamilyNameAttribute));
     }
 
     wxCFStringRef familyName( (CFStringRef) CTFontDescriptorCopyAttribute(m_ctFontDescriptor, kCTFontFamilyNameAttribute));

-    m_faceName = familyName.AsString(); 
+    m_faceName = familyName.AsString();

 }
 #endif
 
 }
 #endif
 


@@ -983,7 +983,7 @@ void wxNativeFontInfo::EnsureValid()
 {
     if ( m_descriptorValid )
         return;
 {
     if ( m_descriptorValid )
         return;

-        
+

 #if wxOSX_USE_CORE_TEXT
     if ( m_ctFontDescriptor == NULL && UMAGetSystemVersion() >= 0x1050 )
     {
 #if wxOSX_USE_CORE_TEXT
     if ( m_ctFontDescriptor == NULL && UMAGetSystemVersion() >= 0x1050 )
     {

diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index 7890a015d674525d4ae5c9cc5db19aa5decaf232..c9f6b041bb927c9ca8266179f200c91d65a9acf0 100644 (file)
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -194,12 +194,12 @@ int RunMixedFontDialog(wxFontDialog* dialog)
 
     NSModalSession session = [NSApp beginModalSessionForWindow:fontPanel];
 
 
     NSModalSession session = [NSApp beginModalSessionForWindow:fontPanel];
 

-    for (;;) 
+    for (;;)

     {
         if ([NSApp runModalSession:session] != NSRunContinuesResponse)
             break;
     }
     {
         if ([NSApp runModalSession:session] != NSRunContinuesResponse)
             break;
     }

-    
+

     [NSApp endModalSession:session];
 
     // if we don't reenable it, FPShowHideFontPanel does not work
     [NSApp endModalSession:session];
 
     // if we don't reenable it, FPShowHideFontPanel does not work

diff --git a/src/osx/carbon/gauge.cpp b/src/osx/carbon/gauge.cpp
index 9cf0d8a62027159e6172e06678341acb8852076e..9a74a41a7c29ed5ec8284e1ee46949b70a185d0a 100644 (file)
--- a/src/osx/carbon/gauge.cpp
+++ b/src/osx/carbon/gauge.cpp
@@ -23,7 +23,7 @@ public :
     wxMacGaugeCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
     {
     }
     wxMacGaugeCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
     {
     }

-    
+

     void SetMaximum(wxInt32 v)
     {
         // switch back to determinate mode if not there already
     void SetMaximum(wxInt32 v)
     {
         // switch back to determinate mode if not there already


@@ -34,7 +34,7 @@ public :
 
         wxMacControl::SetMaximum( v ) ;
     }
 
         wxMacControl::SetMaximum( v ) ;
     }

-    
+

     void SetValue(wxInt32 v)
     {
         // switch back to determinate mode if not there already
     void SetValue(wxInt32 v)
     {
         // switch back to determinate mode if not there already


@@ -54,7 +54,7 @@ public :
                 SetNeedsDisplay(NULL) ;
         }
     }
                 SetNeedsDisplay(NULL) ;
         }
     }

-    
+

     void PulseGauge()
     {
         if ( GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != true )
     void PulseGauge()
     {
         if ( GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != true )


@@ -70,15 +70,15 @@ public :
 };
 
 
 };
 
 

-wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );

diff --git a/src/osx/carbon/glcanvas.cpp b/src/osx/carbon/glcanvas.cpp
index 4084a19ecbbc9ee2da4c76f66a5fe150fcfd0c61..4029acc11c26ed824f3ebb5e7b4256db6ef4ed03 100644 (file)
--- a/src/osx/carbon/glcanvas.cpp
+++ b/src/osx/carbon/glcanvas.cpp
@@ -268,7 +268,7 @@ bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
     GLint bufnummer = win.GetAglBufferName();
     aglSetInteger(m_glContext, AGL_BUFFER_NAME, &bufnummer);
     //win.SetLastContext(m_glContext);
     GLint bufnummer = win.GetAglBufferName();
     aglSetInteger(m_glContext, AGL_BUFFER_NAME, &bufnummer);
     //win.SetLastContext(m_glContext);

-    
+

     const_cast<wxGLCanvas&>(win).SetViewport();
 
     if ( !aglSetDrawable(m_glContext, drawable) )
     const_cast<wxGLCanvas&>(win).SetViewport();
 
     if ( !aglSetDrawable(m_glContext, drawable) )


@@ -286,19 +286,19 @@ bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
 
 /*
 
 
 /*
 

-sharing contexts under AGL is not straightforward, to quote from 
+sharing contexts under AGL is not straightforward, to quote from

 
 http://lists.apple.com/archives/mac-opengl/2003/Jan/msg00402.html :
 
 
 http://lists.apple.com/archives/mac-opengl/2003/Jan/msg00402.html :
 

-In Carbon OpenGL (AGL) you would use call aglSetInteger to setup a 
-buffer name and attached each context to that same name. From AGL 
+In Carbon OpenGL (AGL) you would use call aglSetInteger to setup a
+buffer name and attached each context to that same name. From AGL

 you can do:
 
 GLint id = 1;
 
 ctx1 = aglCreateContext...
 aglSetInteger(ctx1, AGL_BUFFER_NAME, &id); // create name
 you can do:
 
 GLint id = 1;
 
 ctx1 = aglCreateContext...
 aglSetInteger(ctx1, AGL_BUFFER_NAME, &id); // create name

-aglAttachDrawable (ctx1,...); // create surface with associated with 
+aglAttachDrawable (ctx1,...); // create surface with associated with

 name (first time)
 ctx2 = aglCreateContext...
 aglSetInteger(ctx2, AGL_BUFFER_NAME, &id); // uses previously created name
 name (first time)
 ctx2 = aglCreateContext...
 aglSetInteger(ctx2, AGL_BUFFER_NAME, &id); // uses previously created name


@@ -320,7 +320,7 @@ context behavior.
 */
 
 /*
 */
 
 /*

-so what I'm doing is to have a dummy aglContext attached to a wxGLCanvas, 
+so what I'm doing is to have a dummy aglContext attached to a wxGLCanvas,

 assign it a buffer number
 */
 
 assign it a buffer number
 */
 


@@ -348,8 +348,8 @@ bool wxGLCanvas::Create(wxWindow *parent,
 
     static GLint gCurrentBufferName = 1;
     m_bufferName = gCurrentBufferName++;
 
     static GLint gCurrentBufferName = 1;
     m_bufferName = gCurrentBufferName++;

-    aglSetInteger (m_dummyContext, AGL_BUFFER_NAME, &m_bufferName); 
-    
+    aglSetInteger (m_dummyContext, AGL_BUFFER_NAME, &m_bufferName);
+

     AGLDrawable drawable = (AGLDrawable)GetWindowPort(MAC_WXHWND(MacGetTopLevelWindowRef()));
     aglSetDrawable(m_dummyContext, drawable);
 
     AGLDrawable drawable = (AGLDrawable)GetWindowPort(MAC_WXHWND(MacGetTopLevelWindowRef()));
     aglSetDrawable(m_dummyContext, drawable);
 


@@ -362,7 +362,7 @@ wxGLCanvas::~wxGLCanvas()
 {
     if ( m_glFormat )
         WXGLDestroyPixelFormat(m_glFormat);
 {
     if ( m_glFormat )
         WXGLDestroyPixelFormat(m_glFormat);

-        
+

     if ( m_dummyContext )
         WXGLDestroyContext(m_dummyContext);
 }
     if ( m_dummyContext )
         WXGLDestroyContext(m_dummyContext);
 }

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index b3fc827537ebeb18f4ddf7d9146868389be4e196..d5f4f7e7045c24073ba2bd87f2090ef49b11d77d 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -98,7 +98,7 @@ typedef enum CGCompositeOperation {
    kCGCompositeOperationDestinationAtop = 9,
    kCGCompositeOperationXOR             = 10,
    kCGCompositeOperationPlusDarker      = 11,
    kCGCompositeOperationDestinationAtop = 9,
    kCGCompositeOperationXOR             = 10,
    kCGCompositeOperationPlusDarker      = 11,

-// NS only, unsupported by CG : Highlight 
+// NS only, unsupported by CG : Highlight

    kCGCompositeOperationPlusLighter     = 12
 } CGCompositeOperation ;
 
    kCGCompositeOperationPlusLighter     = 12
 } CGCompositeOperation ;
 


@@ -1349,7 +1349,7 @@ public:
     virtual void BeginLayer(wxDouble opacity);
 
     virtual void EndLayer();
     virtual void BeginLayer(wxDouble opacity);
 
     virtual void EndLayer();

-    
+

     //
     // transformation
     //
     //
     // transformation
     //


@@ -1597,7 +1597,7 @@ bool wxMacCoreGraphicsContext::EnsureIsValid()
     {
         if (m_invisible)
             return false;
     {
         if (m_invisible)
             return false;

-            
+

 #if wxOSX_USE_COCOA
         if ( wxOSXLockFocus(m_view) )
         {
 #if wxOSX_USE_COCOA
         if ( wxOSXLockFocus(m_view) )
         {


@@ -1649,7 +1649,7 @@ bool wxMacCoreGraphicsContext::EnsureIsValid()
             }
 #endif
             CGContextSaveGState( m_cgContext );
             }
 #endif
             CGContextSaveGState( m_cgContext );

-            
+

 #if 0 // turn on for debugging of clientdc
             static float color = 0.5 ;
             static int channel = 0 ;
 #if 0 // turn on for debugging of clientdc
             static float color = 0.5 ;
             static int channel = 0 ;


@@ -1678,9 +1678,9 @@ bool wxMacCoreGraphicsContext::SetAntialiasMode(wxAntialiasMode antialias)
 
     if (m_antialias == antialias)
         return true;
 
     if (m_antialias == antialias)
         return true;

-    
+

     m_antialias = antialias;
     m_antialias = antialias;

-    
+

     bool antialiasMode;
     switch (antialias)
     {
     bool antialiasMode;
     switch (antialias)
     {


@@ -1704,12 +1704,12 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
 
     if ( m_composition == op )
         return true;
 
     if ( m_composition == op )
         return true;

-        
+

     m_composition = op;
     m_composition = op;

-    
+

     if (m_composition == wxCOMPOSITION_DEST)
         return true;
     if (m_composition == wxCOMPOSITION_DEST)
         return true;

-        
+

 #if wxOSX_USE_COCOA_OR_CARBON
     if ( UMAGetSystemVersion() < 0x1060 )
     {
 #if wxOSX_USE_COCOA_OR_CARBON
     if ( UMAGetSystemVersion() < 0x1060 )
     {


@@ -1718,37 +1718,37 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
         switch( op )
         {
         case wxCOMPOSITION_CLEAR:
         switch( op )
         {
         case wxCOMPOSITION_CLEAR:

-            cop = kCGCompositeOperationClear; 
+            cop = kCGCompositeOperationClear;

             break;
         case wxCOMPOSITION_SOURCE:
             break;
         case wxCOMPOSITION_SOURCE:

-            cop = kCGCompositeOperationCopy; 
+            cop = kCGCompositeOperationCopy;

             break;
         case wxCOMPOSITION_OVER:
             break;
         case wxCOMPOSITION_OVER:

-            mode = kCGBlendModeNormal; 
+            mode = kCGBlendModeNormal;

             break;
         case wxCOMPOSITION_IN:
             break;
         case wxCOMPOSITION_IN:

-            cop = kCGCompositeOperationSourceIn; 
+            cop = kCGCompositeOperationSourceIn;

             break;
         case wxCOMPOSITION_OUT:
             break;
         case wxCOMPOSITION_OUT:

-            cop = kCGCompositeOperationSourceOut; 
+            cop = kCGCompositeOperationSourceOut;

             break;
         case wxCOMPOSITION_ATOP:
             break;
         case wxCOMPOSITION_ATOP:

-            cop = kCGCompositeOperationSourceAtop; 
+            cop = kCGCompositeOperationSourceAtop;

             break;
         case wxCOMPOSITION_DEST_OVER:
             break;
         case wxCOMPOSITION_DEST_OVER:

-            cop = kCGCompositeOperationDestinationOver; 
+            cop = kCGCompositeOperationDestinationOver;

             break;
         case wxCOMPOSITION_DEST_IN:
             break;
         case wxCOMPOSITION_DEST_IN:

-            cop = kCGCompositeOperationDestinationIn; 
+            cop = kCGCompositeOperationDestinationIn;

             break;
         case wxCOMPOSITION_DEST_OUT:
             break;
         case wxCOMPOSITION_DEST_OUT:

-            cop = kCGCompositeOperationDestinationOut; 
+            cop = kCGCompositeOperationDestinationOut;

             break;
         case wxCOMPOSITION_DEST_ATOP:
             break;
         case wxCOMPOSITION_DEST_ATOP:

-           cop = kCGCompositeOperationDestinationAtop; 
+           cop = kCGCompositeOperationDestinationAtop;

             break;
         case wxCOMPOSITION_XOR:
             break;
         case wxCOMPOSITION_XOR:

-            cop = kCGCompositeOperationXOR; 
+            cop = kCGCompositeOperationXOR;

             break;
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
         case wxCOMPOSITION_ADD:
             break;
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
         case wxCOMPOSITION_ADD:


@@ -1771,39 +1771,39 @@ bool wxMacCoreGraphicsContext::SetCompositionMode(wxCompositionMode op)
         switch( op )
         {
         case wxCOMPOSITION_CLEAR:
         switch( op )
         {
         case wxCOMPOSITION_CLEAR:

-            mode = kCGBlendModeClear; 
+            mode = kCGBlendModeClear;

             break;
         case wxCOMPOSITION_SOURCE:
             break;
         case wxCOMPOSITION_SOURCE:

-            mode = kCGBlendModeCopy; 
+            mode = kCGBlendModeCopy;

             break;
         case wxCOMPOSITION_OVER:
             break;
         case wxCOMPOSITION_OVER:

-            mode = kCGBlendModeNormal; 
+            mode = kCGBlendModeNormal;

             break;
         case wxCOMPOSITION_IN:
             break;
         case wxCOMPOSITION_IN:

-            mode = kCGBlendModeSourceIn; 
+            mode = kCGBlendModeSourceIn;

             break;
         case wxCOMPOSITION_OUT:
             break;
         case wxCOMPOSITION_OUT:

-            mode = kCGBlendModeSourceOut; 
+            mode = kCGBlendModeSourceOut;

             break;
         case wxCOMPOSITION_ATOP:
             break;
         case wxCOMPOSITION_ATOP:

-            mode = kCGBlendModeSourceAtop; 
+            mode = kCGBlendModeSourceAtop;

             break;
         case wxCOMPOSITION_DEST_OVER:
             break;
         case wxCOMPOSITION_DEST_OVER:

-            mode = kCGBlendModeDestinationOver; 
+            mode = kCGBlendModeDestinationOver;

             break;
         case wxCOMPOSITION_DEST_IN:
             break;
         case wxCOMPOSITION_DEST_IN:

-            mode = kCGBlendModeDestinationIn; 
+            mode = kCGBlendModeDestinationIn;

             break;
         case wxCOMPOSITION_DEST_OUT:
             break;
         case wxCOMPOSITION_DEST_OUT:

-            mode = kCGBlendModeDestinationOut; 
+            mode = kCGBlendModeDestinationOut;

             break;
         case wxCOMPOSITION_DEST_ATOP:
             break;
         case wxCOMPOSITION_DEST_ATOP:

-           mode = kCGBlendModeDestinationAtop; 
+           mode = kCGBlendModeDestinationAtop;

             break;
         case wxCOMPOSITION_XOR:
             break;
         case wxCOMPOSITION_XOR:

-            mode = kCGBlendModeXOR; 
+            mode = kCGBlendModeXOR;

             break;
             break;

-            
+

         case wxCOMPOSITION_ADD:
             mode = kCGBlendModePlusLighter ;
             break;
         case wxCOMPOSITION_ADD:
             mode = kCGBlendModePlusLighter ;
             break;


@@ -1918,7 +1918,7 @@ void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath &path )
 
     if (EnsureIsValid()==false)
         return;
 
     if (EnsureIsValid()==false)
         return;

-        
+

     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 


@@ -1933,7 +1933,7 @@ void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , wxPolygonF
 {
     if (EnsureIsValid()==false)
         return;
 {
     if (EnsureIsValid()==false)
         return;

-        
+

     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 


@@ -1989,7 +1989,7 @@ void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath &path , wxPolygonF
 
     if (EnsureIsValid()==false)
         return;
 
     if (EnsureIsValid()==false)
         return;

-        
+

     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 


@@ -2023,7 +2023,7 @@ void wxMacCoreGraphicsContext::SetNativeContext( CGContextRef cg )
         CGContextRestoreGState( m_cgContext );
         if ( m_contextSynthesized )
         {
         CGContextRestoreGState( m_cgContext );
         if ( m_contextSynthesized )
         {

-            // TODO: in case of performance problems, try issuing this not too 
+            // TODO: in case of performance problems, try issuing this not too

             // frequently (half of refresh rate)
             CGContextFlush(m_cgContext);
 #if wxOSX_USE_CARBON
             // frequently (half of refresh rate)
             CGContextFlush(m_cgContext);
 #if wxOSX_USE_CARBON


@@ -2093,7 +2093,7 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;

-        
+

 #ifdef __WXMAC__
     wxMacCoreGraphicsBitmapData* refdata  =static_cast<wxMacCoreGraphicsBitmapData*>(bmp.GetRefData());
     CGImageRef image = refdata->GetBitmap();
 #ifdef __WXMAC__
     wxMacCoreGraphicsBitmapData* refdata  =static_cast<wxMacCoreGraphicsBitmapData*>(bmp.GetRefData());
     CGImageRef image = refdata->GetBitmap();


@@ -2132,7 +2132,7 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl
 {
     if (EnsureIsValid()==false)
         return;
 {
     if (EnsureIsValid()==false)
         return;

-        
+

     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 


@@ -2151,7 +2151,7 @@ void wxMacCoreGraphicsContext::PushState()
 {
     if (EnsureIsValid()==false)
         return;
 {
     if (EnsureIsValid()==false)
         return;

-        
+

     CGContextSaveGState( m_cgContext );
 }
 
     CGContextSaveGState( m_cgContext );
 }
 


@@ -2159,7 +2159,7 @@ void wxMacCoreGraphicsContext::PopState()
 {
     if (EnsureIsValid()==false)
         return;
 {
     if (EnsureIsValid()==false)
         return;

-        
+

     CGContextRestoreGState( m_cgContext );
 }
 
     CGContextRestoreGState( m_cgContext );
 }
 


@@ -2169,7 +2169,7 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
 
     if (EnsureIsValid()==false)
         return;
 
     if (EnsureIsValid()==false)
         return;

-        
+

     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 


@@ -2232,7 +2232,7 @@ void wxMacCoreGraphicsContext::DoDrawRotatedText(const wxString &str,
 
     if (EnsureIsValid()==false)
         return;
 
     if (EnsureIsValid()==false)
         return;

-        
+

     if (m_composition == wxCOMPOSITION_DEST)
         return;
 
     if (m_composition == wxCOMPOSITION_DEST)
         return;
 

diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index f688c91dd1a83406c9b472c3307718d4e6a084cc..55cf9e6e073d8b8a284512c05f8953fd930daf8d 100644 (file)
--- a/src/osx/carbon/listbox.cpp
+++ b/src/osx/carbon/listbox.cpp
@@ -30,12 +30,12 @@
 // list box control implementation
 // ============================================================================
 
 // list box control implementation
 // ============================================================================
 

-wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( wxpeer, pos, size, style );
                                     long WXUNUSED(extraStyle))
 {
     wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( wxpeer, pos, size, style );


@@ -175,7 +175,7 @@ OSStatus wxMacListBoxItem::GetSetData(wxMacDataItemBrowserControl *owner ,
             wxListBox *list = wxDynamicCast( owner->GetWXPeer() , wxListBox );
             wxMacDataBrowserCellValue valueholder(itemData);
             list->GetValueCallback( n , col, valueholder );
             wxListBox *list = wxDynamicCast( owner->GetWXPeer() , wxListBox );
             wxMacDataBrowserCellValue valueholder(itemData);
             list->GetValueCallback( n , col, valueholder );

-            
+

             err = noErr;
         }
         else
             err = noErr;
         }
         else


@@ -191,7 +191,7 @@ OSStatus wxMacListBoxItem::GetSetData(wxMacDataItemBrowserControl *owner ,
             }
 
         }
             }
 
         }

-        
+

     }
     else
     {
     }
     else
     {


@@ -226,7 +226,7 @@ OSStatus wxMacListBoxItem::GetSetData(wxMacDataItemBrowserControl *owner ,
     {
         err = wxMacDataItem::GetSetData(owner, property, itemData, changeValue);
     }
     {
         err = wxMacDataItem::GetSetData(owner, property, itemData, changeValue);
     }

-    
+

     return err;
 }
 
     return err;
 }
 


@@ -261,7 +261,7 @@ wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const
     : wxMacDataItemBrowserControl( peer, pos, size, style )
 {
     m_nextColumnId = 0 ;
     : wxMacDataItemBrowserControl( peer, pos, size, style )
 {
     m_nextColumnId = 0 ;

-    
+

     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     if ( style & wxLB_SORT )
     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     if ( style & wxLB_SORT )


@@ -351,7 +351,7 @@ void wxMacDataBrowserListControl::ItemNotification(
 {
     wxListBox *list = wxDynamicCast( GetWXPeer() , wxListBox );
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));
 {
     wxListBox *list = wxDynamicCast( GetWXPeer() , wxListBox );
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));

-    
+

     if (list->HasMultipleSelection() && (message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         list->CalcAndSendEvent();
     if (list->HasMultipleSelection() && (message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         list->CalcAndSendEvent();


@@ -361,14 +361,14 @@ void wxMacDataBrowserListControl::ItemNotification(
     if ((message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
     if ((message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );

-        
+

         int sel = list->GetSelection();
         if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
            return;
         list->HandleLineEvent( sel, false );
         return;
     }
         int sel = list->GetSelection();
         if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
            return;
         list->HandleLineEvent( sel, false );
         return;
     }

-    
+

     // call super for item level(wxMacDataItem->Notification) callback processing
     wxMacDataItemBrowserControl::ItemNotification( itemID, message, itemData);
 }
     // call super for item level(wxMacDataItem->Notification) callback processing
     wxMacDataItemBrowserControl::ItemNotification( itemID, message, itemData);
 }


@@ -385,7 +385,7 @@ wxWindow * wxMacDataBrowserListControl::GetPeer() const
 // List Methods
 //
 
 // List Methods
 //
 

-wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned int pos, DataBrowserPropertyID property, 
+wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned int pos, DataBrowserPropertyID property,

                                 const wxString& title, bool editable,
                                 DataBrowserPropertyType colType, SInt16 just, int width )
 {
                                 const wxString& title, bool editable,
                                 DataBrowserPropertyType colType, SInt16 just, int width )
 {


@@ -419,7 +419,7 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned in
     columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
     columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;

-    
+

     if ( editable )
         columnDesc.propertyDesc.propertyFlags |= kDataBrowserPropertyIsMutable;
 
     if ( editable )
         columnDesc.propertyDesc.propertyFlags |= kDataBrowserPropertyIsMutable;
 


@@ -431,38 +431,38 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned in
     }
 
     wxMacDataBrowserColumn *col = new wxMacDataBrowserColumn( property, colType, editable );
     }
 
     wxMacDataBrowserColumn *col = new wxMacDataBrowserColumn( property, colType, editable );

-    
+

     m_columns.Insert( col, pos );
     m_columns.Insert( col, pos );

-    
+

     return col;
 }
 
     return col;
 }
 

-wxListWidgetColumn* wxMacDataBrowserListControl::InsertTextColumn( unsigned pos, const wxString& title, bool editable, 
-                                wxAlignment just, int defaultWidth) 
+wxListWidgetColumn* wxMacDataBrowserListControl::InsertTextColumn( unsigned pos, const wxString& title, bool editable,
+                                wxAlignment just, int defaultWidth)

 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;
 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;

-    
+

     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;
     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;

-     
-    return DoInsertColumn( pos, property, title, editable, kDataBrowserTextType,  just, defaultWidth );   
+
+    return DoInsertColumn( pos, property, title, editable, kDataBrowserTextType,  just, defaultWidth );

 }
 
 }
 

-wxListWidgetColumn* wxMacDataBrowserListControl::InsertCheckColumn( unsigned pos , const wxString& title, bool editable, 
-                                wxAlignment just, int defaultWidth ) 
+wxListWidgetColumn* wxMacDataBrowserListControl::InsertCheckColumn( unsigned pos , const wxString& title, bool editable,
+                                wxAlignment just, int defaultWidth )

 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;
 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;

-    
+

     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;
     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;

-        
-    return DoInsertColumn( pos, property, title, editable, kDataBrowserCheckboxType,  just, defaultWidth );   
+
+    return DoInsertColumn( pos, property, title, editable, kDataBrowserCheckboxType,  just, defaultWidth );

 }
 
 wxMacDataBrowserColumn* wxMacDataBrowserListControl::GetColumnFromProperty( DataBrowserPropertyID property)
 }
 
 wxMacDataBrowserColumn* wxMacDataBrowserListControl::GetColumnFromProperty( DataBrowserPropertyID property)


@@ -470,7 +470,7 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::GetColumnFromProperty( Data
     for ( unsigned int i = 0; i < m_columns.size() ; ++ i )
         if ( m_columns[i]->GetProperty() == property )
             return m_columns[i];
     for ( unsigned int i = 0; i < m_columns.size() ; ++ i )
         if ( m_columns[i]->GetProperty() == property )
             return m_columns[i];

-            
+

     return NULL;
 }
 
     return NULL;
 }
 


@@ -579,15 +579,15 @@ void wxMacDataBrowserListControl::ListScrollTo( unsigned int n )
 
     RevealItem( item , kDataBrowserRevealWithoutSelecting );
 }
 
     RevealItem( item , kDataBrowserRevealWithoutSelecting );
 }

-    
-void wxMacDataBrowserListControl::UpdateLine( unsigned int n, wxListWidgetColumn* col ) 
+
+void wxMacDataBrowserListControl::UpdateLine( unsigned int n, wxListWidgetColumn* col )

 {
     wxMacDataBrowserColumn* dbcol = dynamic_cast<wxMacDataBrowserColumn*> (col);
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
     UpdateItem(wxMacDataBrowserRootContainer, item, dbcol ? dbcol->GetProperty() : kDataBrowserNoItem );
 }
 
 {
     wxMacDataBrowserColumn* dbcol = dynamic_cast<wxMacDataBrowserColumn*> (col);
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
     UpdateItem(wxMacDataBrowserRootContainer, item, dbcol ? dbcol->GetProperty() : kDataBrowserNoItem );
 }
 

-void wxMacDataBrowserListControl::UpdateLineToEnd( unsigned int n) 
+void wxMacDataBrowserListControl::UpdateLineToEnd( unsigned int n)

 {
     // with databrowser inserting does not need updating the entire model, it's done by databrowser itself
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
 {
     // with databrowser inserting does not need updating the entire model, it's done by databrowser itself
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );


@@ -607,8 +607,8 @@ void wxMacDataBrowserCellValue::Set( const wxString& value )
     SetDataBrowserItemDataText( m_data, (CFStringRef) cf);
 }
 
     SetDataBrowserItemDataText( m_data, (CFStringRef) cf);
 }
 

-void wxMacDataBrowserCellValue::Set( int value ) 
-{  
+void wxMacDataBrowserCellValue::Set( int value )
+{

     SetDataBrowserItemDataValue( m_data, value );
 }
 
     SetDataBrowserItemDataValue( m_data, value );
 }
 


@@ -616,15 +616,15 @@ void wxMacDataBrowserCellValue::Check( bool check )
 {
     SetDataBrowserItemDataButtonValue( m_data, check ? kThemeButtonOn : kThemeButtonOff);
 }
 {
     SetDataBrowserItemDataButtonValue( m_data, check ? kThemeButtonOn : kThemeButtonOff);
 }

-    
-int wxMacDataBrowserCellValue::GetIntValue() const 
+
+int wxMacDataBrowserCellValue::GetIntValue() const

 {
     SInt32 value;
     GetDataBrowserItemDataValue( m_data, &value );
     return value;
 }
 
 {
     SInt32 value;
     GetDataBrowserItemDataValue( m_data, &value );
     return value;
 }
 

-wxString wxMacDataBrowserCellValue::GetStringValue() const 
+wxString wxMacDataBrowserCellValue::GetStringValue() const

 {
     CFStringRef value;
     GetDataBrowserItemDataText ( m_data, &value );
 {
     CFStringRef value;
     GetDataBrowserItemDataText ( m_data, &value );

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index 97ecc4ffe6c82f19bce77b0d6ccf0780a6b4422d..034b4d073d7b380c7de44684216b8cec9782273e 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -148,10 +148,10 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
                 if (result == kControlButtonPart){
                     DataBrowserPropertyID col;
                     GetDataBrowserSortProperty(controlRef, &col);
                 if (result == kControlButtonPart){
                     DataBrowserPropertyID col;
                     GetDataBrowserSortProperty(controlRef, &col);

-                    
+

                     DataBrowserTableViewColumnIndex column = 0;
                     verify_noerr( GetDataBrowserTableViewColumnPosition( controlRef, col, &column ) );
                     DataBrowserTableViewColumnIndex column = 0;
                     verify_noerr( GetDataBrowserTableViewColumnPosition( controlRef, col, &column ) );

-                    
+

                     le.m_col = column;
                     // FIXME: we can't use the sort property for virtual listctrls
                     // so we need to find a better way to determine which column was clicked...
                     le.m_col = column;
                     // FIXME: we can't use the sort property for virtual listctrls
                     // so we need to find a better way to determine which column was clicked...


@@ -302,7 +302,7 @@ bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 {
     int id = event.GetId();
     wxObject* obj = event.GetEventObject();
 {
     int id = event.GetId();
     wxObject* obj = event.GetEventObject();

-    
+

     // even though we use a generic list ctrl underneath, make sure
     // we present ourselves as wxListCtrl.
     event.SetEventObject( m_list );
     // even though we use a generic list ctrl underneath, make sure
     // we present ourselves as wxListCtrl.
     event.SetEventObject( m_list );


@@ -670,21 +670,21 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {
 
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {
 

-    
+

     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
         le.SetEventObject(this);
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;
     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
         le.SetEventObject(this);
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;

-        
+

         if (m_current == -1)
         {
             // if m_current isn't set, check if there's been a selection
             // made before continuing
             m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
         }
         if (m_current == -1)
         {
             // if m_current isn't set, check if there's been a selection
             // made before continuing
             m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
         }

-        
+

         // We need to determine m_current ourselves when navigation keys
         // are used. Note that PAGEUP and PAGEDOWN do not alter the current
         // item on native Mac ListCtrl, so we only handle up and down keys.
         // We need to determine m_current ourselves when navigation keys
         // are used. Note that PAGEUP and PAGEDOWN do not alter the current
         // item on native Mac ListCtrl, so we only handle up and down keys.


@@ -695,7 +695,7 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
                     m_current -= 1;
                 else
                     m_current = 0;
                     m_current -= 1;
                 else
                     m_current = 0;

-                    
+

                 break;
 
             case WXK_DOWN:
                 break;
 
             case WXK_DOWN:


@@ -703,7 +703,7 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
                     m_current += 1;
                 else
                     m_current = GetItemCount() - 1;
                     m_current += 1;
                 else
                     m_current = GetItemCount() - 1;

-                    
+

                 break;
         }
 
                 break;
         }
 


@@ -785,7 +785,7 @@ wxListCtrl::~wxListCtrl()
         delete m_imageListState;
 
     delete m_renameTimer;
         delete m_imageListState;
 
     delete m_renameTimer;

-    
+

     WX_CLEAR_LIST(wxColumnList, m_colsInfo);
 }
 
     WX_CLEAR_LIST(wxColumnList, m_colsInfo);
 }
 


@@ -963,7 +963,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
     if (m_dbImpl)
     {
         wxASSERT_MSG( col < (int)m_colsInfo.GetCount(), wxT("invalid column index in wxMacListCtrlItem") );
     if (m_dbImpl)
     {
         wxASSERT_MSG( col < (int)m_colsInfo.GetCount(), wxT("invalid column index in wxMacListCtrlItem") );

-        
+

         long mask = item.GetMask();
         {
             wxListItem listItem;
         long mask = item.GetMask();
         {
             wxListItem listItem;


@@ -1406,7 +1406,7 @@ bool wxListCtrl::GetSubItemRect( long item, long subItem, wxRect& rect, int code
     if (m_genericImpl)
         return m_genericImpl->GetSubItemRect(item, subItem, rect, code);
 
     if (m_genericImpl)
         return m_genericImpl->GetSubItemRect(item, subItem, rect, code);
 

-    // TODO: implement for DataBrowser implementation        
+    // TODO: implement for DataBrowser implementation

     return false;
 }
 
     return false;
 }
 


@@ -1423,7 +1423,7 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 
         DataBrowserTableViewColumnID col = 0;
         verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &col ) );
 
         DataBrowserTableViewColumnID col = 0;
         verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &col ) );

-        
+

         Rect bounds;
         DataBrowserPropertyPart part = kDataBrowserPropertyEnclosingPart;
         if ( code == wxLIST_RECT_LABEL )
         Rect bounds;
         DataBrowserPropertyPart part = kDataBrowserPropertyEnclosingPart;
         if ( code == wxLIST_RECT_LABEL )


@@ -1670,7 +1670,7 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 

-                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line)) 
+                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line))

                     return line;
 
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 
                 if ( (state == wxLIST_STATE_DONTCARE ) )


@@ -1693,7 +1693,7 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 

-                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line)) 
+                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line))

                     return line;
 
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 
                 if ( (state == wxLIST_STATE_DONTCARE ) )


@@ -2170,7 +2170,7 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
                 just = teFlushRight;
         }
         m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);
                 just = teFlushRight;
         }
         m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);

-        
+

         wxListItem* listItem = new wxListItem(item);
         m_colsInfo.Insert( col, listItem );
         SetColumn(col, item);
         wxListItem* listItem = new wxListItem(item);
         m_colsInfo.Insert( col, listItem );
         SetColumn(col, item);


@@ -2703,10 +2703,10 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     wxString text;
     wxFont font = wxNullFont;
     int imgIndex = -1;
     wxString text;
     wxFont font = wxNullFont;
     int imgIndex = -1;

-    
+

     DataBrowserTableViewColumnIndex listColumn = 0;
     GetColumnPosition( property, &listColumn );
     DataBrowserTableViewColumnIndex listColumn = 0;
     GetColumnPosition( property, &listColumn );

-    
+

     wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
     wxMacListCtrlItem* lcItem;
     wxColour color = *wxBLACK;
     wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
     wxMacListCtrlItem* lcItem;
     wxColour color = *wxBLACK;


@@ -3049,7 +3049,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
     {
         item = (wxMacListCtrlItem *) itemID;
     }
     {
         item = (wxMacListCtrlItem *) itemID;
     }

-    
+

     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved )
     {
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved )
     {


@@ -3293,10 +3293,10 @@ void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsign
         }
     }
 }
         }
     }
 }

- 
+

 void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* item )
 {
 void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* item )
 {

-    
+

     wxMacDataItemBrowserControl::MacInsert(n, new wxMacListCtrlItem() );
     MacSetColumnInfo(n, 0, item);
 }
     wxMacDataItemBrowserControl::MacInsert(n, new wxMacListCtrlItem() );
     MacSetColumnInfo(n, 0, item);
 }

diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp
index cdf988e5d86c74fa42094c4e9ef00aa0a2b5ee2d..1c79b752e0e5eaaa8c50a8ac303fe4eb02974435 100644 (file)
--- a/src/osx/carbon/mediactrl.cpp
+++ b/src/osx/carbon/mediactrl.cpp
@@ -327,7 +327,7 @@ wxQTMediaBackend::~wxQTMediaBackend()
         // Dispose of the movie controller
         ::DisposeMovieController(m_mc);
         m_mc = NULL;
         // Dispose of the movie controller
         ::DisposeMovieController(m_mc);
         m_mc = NULL;

-        
+

         // Dispose of offscreen GWorld
         ::DisposeGWorld(m_movieWorld);
     }
         // Dispose of offscreen GWorld
         ::DisposeGWorld(m_movieWorld);
     }


@@ -435,7 +435,7 @@ bool wxQTMediaBackend::Load(const wxString& fileName)
         NULL); // wasChanged
 
     // Do not use ::GetMoviesStickyError() here because it returns -2009
         NULL); // wasChanged
 
     // Do not use ::GetMoviesStickyError() here because it returns -2009

-    // a.k.a. invalid track on valid mpegs          
+    // a.k.a. invalid track on valid mpegs

     if (err == noErr && ::GetMoviesError() == noErr)
     {
         ::CloseMovieFile(movieResFile);
     if (err == noErr && ::GetMoviesError() == noErr)
     {
         ::CloseMovieFile(movieResFile);

diff --git a/src/osx/carbon/menu.cpp b/src/osx/carbon/menu.cpp
index 5db7b7bc502731ec93f21999be7ef7faa477c14b..3b258bba5cab7ff9768c30f35011f6fbe9d6378b 100644 (file)
--- a/src/osx/carbon/menu.cpp
+++ b/src/osx/carbon/menu.cpp
@@ -37,10 +37,10 @@
 
 // under carbon there's no such thing as a MenuItemRef, everything is done
 // on the 'parent' menu via index APIs (first line having index 1 !)
 
 // under carbon there's no such thing as a MenuItemRef, everything is done
 // on the 'parent' menu via index APIs (first line having index 1 !)

-// so to make things still work, we store the wxMenuItemImpl instance as a 
+// so to make things still work, we store the wxMenuItemImpl instance as a

 // RefCon at the respective menu line
 
 // RefCon at the respective menu line
 

-class wxMenuItemCarbonImpl : public wxMenuItemImpl 
+class wxMenuItemCarbonImpl : public wxMenuItemImpl

 {
 public :
     wxMenuItemCarbonImpl( wxMenuItem* peer ) : wxMenuItemImpl(peer)
 {
 public :
     wxMenuItemCarbonImpl( wxMenuItem* peer ) : wxMenuItemImpl(peer)


@@ -48,9 +48,9 @@ public :
         // the parent menu ref is only set, once the item has been attached
         m_parentMenuRef = NULL;
     }
         // the parent menu ref is only set, once the item has been attached
         m_parentMenuRef = NULL;
     }

-    
+

     ~wxMenuItemCarbonImpl();
     ~wxMenuItemCarbonImpl();

-        
+

     void SetBitmap( const wxBitmap& bitmap )
     {
         MenuItemIndex i = FindMenuItemIndex() ;
     void SetBitmap( const wxBitmap& bitmap )
     {
         MenuItemIndex i = FindMenuItemIndex() ;


@@ -74,21 +74,21 @@ public :
 #endif
             }
         }
 #endif
             }
         }

-    }   
-    
-    void Enable( bool enable ) 
+    }
+
+    void Enable( bool enable )

     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )
         {
     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )
         {

-        
+

             if ( GetWXPeer()->GetId() == wxApp::s_macPreferencesMenuItemId)
             {
                 if ( enable )
                     EnableMenuCommand( NULL , kHICommandPreferences ) ;
                 else
                     DisableMenuCommand( NULL , kHICommandPreferences ) ;
             if ( GetWXPeer()->GetId() == wxApp::s_macPreferencesMenuItemId)
             {
                 if ( enable )
                     EnableMenuCommand( NULL , kHICommandPreferences ) ;
                 else
                     DisableMenuCommand( NULL , kHICommandPreferences ) ;

-            } 
+            }

             else if ( GetWXPeer()->GetId() == wxApp::s_macExitMenuItemId)
             {
                 if ( enable )
             else if ( GetWXPeer()->GetId() == wxApp::s_macExitMenuItemId)
             {
                 if ( enable )


@@ -96,20 +96,20 @@ public :
                 else
                     DisableMenuCommand( NULL , kHICommandQuit ) ;
             }
                 else
                     DisableMenuCommand( NULL , kHICommandQuit ) ;
             }

-        
+

             if ( enable )
                 EnableMenuItem(m_parentMenuRef , i);
             else
                 DisableMenuItem(m_parentMenuRef , i);
             if ( enable )
                 EnableMenuItem(m_parentMenuRef , i);
             else
                 DisableMenuItem(m_parentMenuRef , i);

-                
+

             if ( GetWXPeer()->IsSubMenu() )
             {
                 UMAEnableMenuItem( GetWXPeer()->GetSubMenu()->GetHMenu() , 0 , enable ) ;
             }
         }
             if ( GetWXPeer()->IsSubMenu() )
             {
                 UMAEnableMenuItem( GetWXPeer()->GetSubMenu()->GetHMenu() , 0 , enable ) ;
             }
         }

-    }   
-    
-    void Check( bool check ) 
+    }
+
+    void Check( bool check )

     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )
     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )


@@ -119,9 +119,9 @@ public :
             else
                 ::SetItemMark( m_parentMenuRef, i, 0 ) ; // no mark
         }
             else
                 ::SetItemMark( m_parentMenuRef, i, 0 ) ; // no mark
         }

-    }   
+    }

 
 

-    void Hide( bool hide ) 
+    void Hide( bool hide )

     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )
     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )


@@ -131,9 +131,9 @@ public :
             else
                 ChangeMenuItemAttributes( m_parentMenuRef, i, 0 , kMenuItemAttrHidden );
         }
             else
                 ChangeMenuItemAttributes( m_parentMenuRef, i, 0 , kMenuItemAttrHidden );
         }

-    }   
-    
-    void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) 
+    }
+
+    void SetLabel( const wxString& text, wxAcceleratorEntry *entry )

     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )
     {
         MenuItemIndex i = FindMenuItemIndex() ;
         if ( i > 0 )


@@ -142,12 +142,12 @@ public :
             UMASetMenuItemShortcut( m_parentMenuRef, i , entry ) ;
          }
     }
             UMASetMenuItemShortcut( m_parentMenuRef, i , entry ) ;
          }
     }

-        
+

     void * GetHMenuItem() { return NULL; }
     void * GetHMenuItem() { return NULL; }

-    
+

     // Carbon Only
     // Carbon Only

-    
-    void AttachToParent( MenuRef parentMenuRef, MenuItemIndex index ) 
+
+    void AttachToParent( MenuRef parentMenuRef, MenuItemIndex index )

     {
         m_parentMenuRef = parentMenuRef;
         if ( m_parentMenuRef && index > 0 )
     {
         m_parentMenuRef = parentMenuRef;
         if ( m_parentMenuRef && index > 0 )


@@ -180,7 +180,7 @@ protected :
 // wxMenuImpl
 //
 
 // wxMenuImpl
 //
 

-class wxMenuCarbonImpl : public wxMenuImpl 
+class wxMenuCarbonImpl : public wxMenuImpl

 {
 public :
     wxMenuCarbonImpl( wxMenu* peer , MenuRef menu) : wxMenuImpl(peer), m_osxMenu(menu)
 {
 public :
     wxMenuCarbonImpl( wxMenu* peer , MenuRef menu) : wxMenuImpl(peer), m_osxMenu(menu)


@@ -188,8 +188,8 @@ public :
     }
 
     virtual ~wxMenuCarbonImpl();
     }
 
     virtual ~wxMenuCarbonImpl();

-        
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) 
+
+    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)

     {
         // MacOS counts menu items from 1 and inserts after, therefore having the
         // same effect as wx 0 based and inserting before, we must correct pos
     {
         // MacOS counts menu items from 1 and inserts after, therefore having the
         // same effect as wx 0 based and inserting before, we must correct pos


@@ -198,14 +198,14 @@ public :
         MenuItemIndex index = pos;
         if ( pos == (size_t) -1 )
             index = CountMenuItems(m_osxMenu);
         MenuItemIndex index = pos;
         if ( pos == (size_t) -1 )
             index = CountMenuItems(m_osxMenu);

-            
+

         if ( pItem->IsSeparator() )
         {
             InsertMenuItemTextWithCFString( m_osxMenu, CFSTR(""), index, kMenuItemAttrSeparator, 0);
             // now switch to the Carbon 1 based counting
             index += 1 ;
         }
         if ( pItem->IsSeparator() )
         {
             InsertMenuItemTextWithCFString( m_osxMenu, CFSTR(""), index, kMenuItemAttrSeparator, 0);
             // now switch to the Carbon 1 based counting
             index += 1 ;
         }

-        else 
+        else

         {
             InsertMenuItemTextWithCFString( m_osxMenu, CFSTR("placeholder"), index, 0, 0 );
 
         {
             InsertMenuItemTextWithCFString( m_osxMenu, CFSTR("placeholder"), index, 0, 0 );
 


@@ -223,7 +223,7 @@ public :
                 SetMenuItemCommandID( m_osxMenu, index , wxIdToMacCommand(pItem->GetId()) ) ;
             }
         }
                 SetMenuItemCommandID( m_osxMenu, index , wxIdToMacCommand(pItem->GetId()) ) ;
             }
         }

-        
+

         wxMenuItemCarbonImpl* impl = (wxMenuItemCarbonImpl*) pItem->GetPeer();
         impl->AttachToParent( m_osxMenu, index );
         // only now can all settings be updated correctly
         wxMenuItemCarbonImpl* impl = (wxMenuItemCarbonImpl*) pItem->GetPeer();
         impl->AttachToParent( m_osxMenu, index );
         // only now can all settings be updated correctly


@@ -231,8 +231,8 @@ public :
         pItem->UpdateItemStatus();
         pItem->UpdateItemBitmap();
     }
         pItem->UpdateItemStatus();
         pItem->UpdateItemBitmap();
     }

-        
-    virtual void Remove( wxMenuItem *pItem ) 
+
+    virtual void Remove( wxMenuItem *pItem )

     {
         wxMenuItemCarbonImpl* impl = (wxMenuItemCarbonImpl*) pItem->GetPeer();
         if ( impl )
     {
         wxMenuItemCarbonImpl* impl = (wxMenuItemCarbonImpl*) pItem->GetPeer();
         if ( impl )


@@ -245,7 +245,7 @@ public :
             }
         }
     }
             }
         }
     }

-    
+

     virtual void MakeRoot()
     {
         SetRootMenu( m_osxMenu );
     virtual void MakeRoot()
     {
         SetRootMenu( m_osxMenu );


@@ -354,7 +354,7 @@ wxMenuItemCarbonImpl::~wxMenuItemCarbonImpl()
 }
 
 
 }
 
 

-wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, 
+wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer,

                         wxMenu * WXUNUSED(pParentMenu),
                        int WXUNUSED(id),
                        const wxString& WXUNUSED(text),
                         wxMenu * WXUNUSED(pParentMenu),
                        int WXUNUSED(id),
                        const wxString& WXUNUSED(text),

diff --git a/src/osx/carbon/menuitem.cpp b/src/osx/carbon/menuitem.cpp
index 6e6c26d3f7defd5e8b868b5dcd9a9fc2f69a845d..55df8c725ce9a27f8aa0171a5008eef765e26a57 100644 (file)
--- a/src/osx/carbon/menuitem.cpp
+++ b/src/osx/carbon/menuitem.cpp
@@ -21,5 +21,5 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-// because on mac carbon everything is done through MenuRef APIs both implementation 
+// because on mac carbon everything is done through MenuRef APIs both implementation

 // classes are in menu.cpp
 // classes are in menu.cpp

diff --git a/src/osx/carbon/nonownedwnd.cpp b/src/osx/carbon/nonownedwnd.cpp
index da850b200dc650fcbe80ecf984da880081695808..db30cb846c12e61eb17485277852f117fcef3de5 100644 (file)
--- a/src/osx/carbon/nonownedwnd.cpp
+++ b/src/osx/carbon/nonownedwnd.cpp
@@ -132,7 +132,7 @@ void wxNonOwnedWindowCarbonImpl::SetExtraStyle( long exStyle )
 }
 
 bool wxNonOwnedWindowCarbonImpl::SetBackgroundStyle(wxBackgroundStyle style)
 }
 
 bool wxNonOwnedWindowCarbonImpl::SetBackgroundStyle(wxBackgroundStyle style)

-{            
+{

     if ( style == wxBG_STYLE_TRANSPARENT )
     {
         OSStatus err = HIWindowChangeFeatures( m_macWindow, 0, kWindowIsOpaque );
     if ( style == wxBG_STYLE_TRANSPARENT )
     {
         OSStatus err = HIWindowChangeFeatures( m_macWindow, 0, kWindowIsOpaque );


@@ -232,7 +232,7 @@ void wxNonOwnedWindowCarbonImpl::MacSetUnifiedAppearance( bool set )
     // for wx.
     // TODO: Determine if we need this on Leopard as well. (should be harmless either way,
     // though)
     // for wx.
     // TODO: Determine if we need this on Leopard as well. (should be harmless either way,
     // though)

-    // since when creating the peering is not yet completely set-up we call both setters 
+    // since when creating the peering is not yet completely set-up we call both setters

     // explicitely
     m_wxPeer->SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
     SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
     // explicitely
     m_wxPeer->SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
     SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;


@@ -680,7 +680,7 @@ wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
             ::HiliteMenu(0);
             result = noErr ;
         }
             ::HiliteMenu(0);
             result = noErr ;
         }

-    } 
+    }

     else if ( window && windowPart == inProxyIcon )
     {
         // special case proxy icon bar, as we are having a low-level runloop we must do it ourselves
     else if ( window && windowPart == inProxyIcon )
     {
         // special case proxy icon bar, as we are having a low-level runloop we must do it ourselves


@@ -739,7 +739,7 @@ wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
 
         wxWindow* cursorTarget = currentMouseWindow ;
         wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;
 
         wxWindow* cursorTarget = currentMouseWindow ;
         wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;

-        
+

         extern wxCursor gGlobalCursor;
 
         if (!gGlobalCursor.IsOk())
         extern wxCursor gGlobalCursor;
 
         if (!gGlobalCursor.IsOk())


@@ -764,7 +764,7 @@ wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
                 wxSTANDARD_CURSOR->MacInstall() ;
            }
         }
                 wxSTANDARD_CURSOR->MacInstall() ;
            }
         }

-    
+

         // don't mess with controls we don't know about
         // for some reason returning eventNotHandledErr does not lead to the correct behaviour
         // so we try sending them the correct control directly
         // don't mess with controls we don't know about
         // for some reason returning eventNotHandledErr does not lead to the correct behaviour
         // so we try sending them the correct control directly


@@ -868,8 +868,8 @@ wxNonOwnedWindowEventHandler(EventHandlerCallRef WXUNUSED(handler),
                     newRect.bottom - newRect.top + deltaheight ) ;
 
                 toplevelWindow->HandleResizing( cEvent.GetTicks(), &adjustR );
                     newRect.bottom - newRect.top + deltaheight ) ;
 
                 toplevelWindow->HandleResizing( cEvent.GetTicks(), &adjustR );

-                
-                const Rect adjustedRect = { adjustR.y + top  , adjustR.x + left , adjustR.y + top + adjustR.height - deltaheight , 
+
+                const Rect adjustedRect = { adjustR.y + top  , adjustR.x + left , adjustR.y + top + adjustR.height - deltaheight ,

                     adjustR.x + left + adjustR.width - deltawidth } ;
                 if ( !EqualRect( &newRect , &adjustedRect ) )
                     cEvent.SetParameter<Rect>( kEventParamCurrentBounds , &adjustedRect ) ;
                     adjustR.x + left + adjustR.width - deltawidth } ;
                 if ( !EqualRect( &newRect , &adjustedRect ) )
                     cEvent.SetParameter<Rect>( kEventParamCurrentBounds , &adjustedRect ) ;


@@ -1136,7 +1136,7 @@ wxNonOwnedWindowCarbonImpl::~wxNonOwnedWindowCarbonImpl()
 }
 
 void wxNonOwnedWindowCarbonImpl::Destroy()
 }
 
 void wxNonOwnedWindowCarbonImpl::Destroy()

-{    
+{

     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);


@@ -1186,7 +1186,7 @@ void wxNonOwnedWindowCarbonImpl::Create(
     wxWindow* parent,
     const wxPoint& pos,
     const wxSize& size,
     wxWindow* parent,
     const wxPoint& pos,
     const wxSize& size,

-    long style, long extraStyle, 
+    long style, long extraStyle,

     const wxString& WXUNUSED(name) )
 {
 
     const wxString& WXUNUSED(name) )
 {
 


@@ -1483,27 +1483,27 @@ bool wxNonOwnedWindowCarbonImpl::ShowWithEffect(bool show,
     return true;
 }
 
     return true;
 }
 

-void wxNonOwnedWindowCarbonImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) 
+void wxNonOwnedWindowCarbonImpl::SetTitle( const wxString& title, wxFontEncoding encoding )

 {
     SetWindowTitleWithCFString( m_macWindow , wxCFStringRef( title , encoding ) ) ;
 }
 {
     SetWindowTitleWithCFString( m_macWindow , wxCFStringRef( title , encoding ) ) ;
 }

-    
+

 bool wxNonOwnedWindowCarbonImpl::IsMaximized() const
 {
     return IsWindowInStandardState( m_macWindow , NULL , NULL ) ;
 }
 bool wxNonOwnedWindowCarbonImpl::IsMaximized() const
 {
     return IsWindowInStandardState( m_macWindow , NULL , NULL ) ;
 }

-    
+

 bool wxNonOwnedWindowCarbonImpl::IsIconized() const
 {
     return IsWindowCollapsed((WindowRef)GetWXWindow() ) ;
 }
 bool wxNonOwnedWindowCarbonImpl::IsIconized() const
 {
     return IsWindowCollapsed((WindowRef)GetWXWindow() ) ;
 }

-    
+

 void wxNonOwnedWindowCarbonImpl::Iconize( bool iconize )
 {
     if ( IsWindowCollapsable( m_macWindow ) )
         CollapseWindow( m_macWindow , iconize ) ;
 }
 void wxNonOwnedWindowCarbonImpl::Iconize( bool iconize )
 {
     if ( IsWindowCollapsable( m_macWindow ) )
         CollapseWindow( m_macWindow , iconize ) ;
 }

-    
+

 void wxNonOwnedWindowCarbonImpl::Maximize(bool maximize)
 {
     Point idealSize = { 0 , 0 } ;
 void wxNonOwnedWindowCarbonImpl::Maximize(bool maximize)
 {
     Point idealSize = { 0 , 0 } ;


@@ -1524,12 +1524,12 @@ void wxNonOwnedWindowCarbonImpl::Maximize(bool maximize)
     }
     ZoomWindowIdeal( (WindowRef)GetWXWindow() , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
 }
     }
     ZoomWindowIdeal( (WindowRef)GetWXWindow() , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
 }

-    
+

 bool wxNonOwnedWindowCarbonImpl::IsFullScreen() const
 {
     return m_macFullScreenData != NULL ;
 }
 bool wxNonOwnedWindowCarbonImpl::IsFullScreen() const
 {
     return m_macFullScreenData != NULL ;
 }

-    
+

 bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
 {
     if ( show )
 bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
 {
     if ( show )


@@ -1568,7 +1568,7 @@ bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
             y -= top ;
             h += top ;
             // avoid adding the caption twice to the height
             y -= top ;
             h += top ;
             // avoid adding the caption twice to the height

-            outerheight -= top; 
+            outerheight -= top;

         }
 
         if ( style & wxFULLSCREEN_NOBORDER )
         }
 
         if ( style & wxFULLSCREEN_NOBORDER )

diff --git a/src/osx/carbon/notebmac.cpp b/src/osx/carbon/notebmac.cpp
index 560831901c15c1db711c92f6f4587d966c1c1a24..9840b549f4db41da993e02395d78da1d5ed0707c 100644 (file)
--- a/src/osx/carbon/notebmac.cpp
+++ b/src/osx/carbon/notebmac.cpp
@@ -30,12 +30,12 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 

-wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );

diff --git a/src/osx/carbon/popupwin.cpp b/src/osx/carbon/popupwin.cpp
index 299d90386241e5b545086f293170255a2cbbac59..48dff3d929c2849fc6c24b76a725c748a60355ef 100644 (file)
--- a/src/osx/carbon/popupwin.cpp
+++ b/src/osx/carbon/popupwin.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implements wxPopupWindow for wxMac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     implements wxPopupWindow for wxMac
 // Author:      Stefan Csomor
 // Modified by:

-// Created:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Stefan Csomor
 // License:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Stefan Csomor
 // License:     wxWindows licence


@@ -34,7 +34,7 @@
 #include "wx/popupwin.h"
 #include "wx/tooltip.h"
 
 #include "wx/popupwin.h"
 #include "wx/tooltip.h"
 

-#include "wx/osx/private.h"    
+#include "wx/osx/private.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation

diff --git a/src/osx/carbon/printdlg.cpp b/src/osx/carbon/printdlg.cpp
index 0232701404f2ec87723d887792e23b0eb7187094..fae5551255bd1f796db386566c7941177e71a22a 100644 (file)
--- a/src/osx/carbon/printdlg.cpp
+++ b/src/osx/carbon/printdlg.cpp
@@ -35,7 +35,7 @@ int wxMacPrintDialog::ShowModal()
     ((wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
     int result = wxID_CANCEL;
     ((wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferFrom( &m_printDialogData );
 
     int result = wxID_CANCEL;

-    
+

     OSErr err = noErr;
     Boolean accepted;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData();
     OSErr err = noErr;
     Boolean accepted;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData();

diff --git a/src/osx/carbon/radiobut.cpp b/src/osx/carbon/radiobut.cpp
index 61218e28fe21a7860cea8cff35f3a6e56fdadd5a..78c350f0ca896c6c48577e72c04121f9c67cdae2 100644 (file)
--- a/src/osx/carbon/radiobut.cpp
+++ b/src/osx/carbon/radiobut.cpp
@@ -16,14 +16,14 @@
 #include "wx/radiobut.h"
 #include "wx/osx/private.h"
 
 #include "wx/radiobut.h"
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index 8a4b131db884e5d3d6cc5d7257bd28c1205410e9..1df36935a32dd09ec113e956b4b8972a8c33fdba 100644 (file)
--- a/src/osx/carbon/region.cpp
+++ b/src/osx/carbon/region.cpp
@@ -101,7 +101,7 @@ wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode WXUNUSED(f
     wxUnusedVar(n);
     wxUnusedVar(points);
 
     wxUnusedVar(n);
     wxUnusedVar(points);
 

-#if 0 
+#if 0

     // no non-QD APIs available
     // TODO : remove ?
     // OS X somehow does not collect the region invisibly as before, so sometimes things
     // no non-QD APIs available
     // TODO : remove ?
     // OS X somehow does not collect the region invisibly as before, so sometimes things


@@ -139,7 +139,7 @@ wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode WXUNUSED(f
 
         RgnHandle tempRgn = NewRgn();
         CloseRgn( tempRgn ) ;
 
         RgnHandle tempRgn = NewRgn();
         CloseRgn( tempRgn ) ;

- 
+

         ::SetGWorld( oldWorld, oldGDHandle );
         wxCFRef<HIShapeRef> tempShape( HIShapeCreateWithQDRgn(tempRgn ) );
         m_refData = new wxRegionRefData(tempShape);
         ::SetGWorld( oldWorld, oldGDHandle );
         wxCFRef<HIShapeRef> tempShape( HIShapeCreateWithQDRgn(tempRgn ) );
         m_refData = new wxRegionRefData(tempShape);


@@ -504,7 +504,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
         if ( HIShapeEnumerate != NULL )
         {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
         if ( HIShapeEnumerate != NULL )
         {

-            OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback, 
+            OSStatus err = HIShapeEnumerate (OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsCounterCallback,

                 (void*)&m_numRects);
             if (err == noErr)
             {
                 (void*)&m_numRects);
             if (err == noErr)
             {


@@ -512,7 +512,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
                 RegionToRectsCallbackData data ;
                 data.m_rects = m_rects ;
                 data.m_current = 0 ;
                 RegionToRectsCallbackData data ;
                 data.m_rects = m_rects ;
                 data.m_current = 0 ;

-                HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback, 
+                HIShapeEnumerate( OTHER_M_REGION(region), kHIShapeParseFromTopLeft, wxOSXRegionToRectsSetterCallback,

                     (void*)&data );
             }
             else
                     (void*)&data );
             }
             else


@@ -536,7 +536,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
                 RegionToRectsCallbackData data ;
                 data.m_rects = m_rects ;
                 data.m_current = 0 ;
                 RegionToRectsCallbackData data ;
                 data.m_rects = m_rects ;
                 data.m_current = 0 ;

-                QDRegionToRects( rgn , kQDParseRegionFromTopLeft, wxMacRegionToRectsSetterCallback, 
+                QDRegionToRects( rgn , kQDParseRegionFromTopLeft, wxMacRegionToRectsSetterCallback,

                     (void*)&data );
             }
             else
                     (void*)&data );
             }
             else

diff --git a/src/osx/carbon/scrolbar.cpp b/src/osx/carbon/scrolbar.cpp
index c5ccacbb6ebc23eeb650486a035aa325106c35fe..53487b5e8e20645aea6351410822e2a5a6aa1a1e 100644 (file)
--- a/src/osx/carbon/scrolbar.cpp
+++ b/src/osx/carbon/scrolbar.cpp
@@ -27,8 +27,8 @@ public :
     wxOSXScrollBarCarbonImpl( wxWindowMac* peer) : wxMacControl( peer )
     {
     }
     wxOSXScrollBarCarbonImpl( wxWindowMac* peer) : wxMacControl( peer )
     {
     }

-    
-    void    SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) 
+
+    void    SetScrollThumb( wxInt32 value, wxInt32 thumbSize )

     {
         SetValue( value );
         SetControlViewSize(m_controlRef , thumbSize );
     {
         SetValue( value );
         SetControlViewSize(m_controlRef , thumbSize );


@@ -36,12 +36,12 @@ public :
 protected:
 };
 
 protected:
 };
 

-wxWidgetImplType* wxWidgetImpl::CreateScrollBar( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateScrollBar( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );

diff --git a/src/osx/carbon/settings.cpp b/src/osx/carbon/settings.cpp
index 37421f59047fed6413ad208973f9463a19e00f0a..bc6b13ad73785b2891be80f89aec4f910e808f9e 100644 (file)
--- a/src/osx/carbon/settings.cpp
+++ b/src/osx/carbon/settings.cpp
@@ -159,7 +159,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
     wxFont font;
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
     wxFont font;

-    
+

     switch (index)
     {
         case wxSYS_ANSI_VAR_FONT :
     switch (index)
     {
         case wxSYS_ANSI_VAR_FONT :


@@ -252,7 +252,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
 #if wxOSX_USE_CARBON
             return (int)(GetDblTime() * 1000. / 60.);
 #else
 #if wxOSX_USE_CARBON
             return (int)(GetDblTime() * 1000. / 60.);
 #else

-            // default on mac is 30 ticks, we shouldn't really use wxSYS_DCLICK_MSEC anyway 
+            // default on mac is 30 ticks, we shouldn't really use wxSYS_DCLICK_MSEC anyway

             // but rather rely on the 'click-count' by the system delivered in a mouse event
             return 500;
 #endif
             // but rather rely on the 'click-count' by the system delivered in a mouse event
             return 500;
 #endif

diff --git a/src/osx/carbon/slider.cpp b/src/osx/carbon/slider.cpp
index 11d2301592039d1da8c7a5370ac6f726548c0d38..b471a01680f00e17d844ffca1656ce18a95b46c7 100644 (file)
--- a/src/osx/carbon/slider.cpp
+++ b/src/osx/carbon/slider.cpp
@@ -16,15 +16,15 @@
 #include "wx/slider.h"
 #include "wx/osx/private.h"
 
 #include "wx/slider.h"
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );

diff --git a/src/osx/carbon/spinbutt.cpp b/src/osx/carbon/spinbutt.cpp
index 9c45ad494b6ed2adfa7471902dfbae1c20b70aab..8068d96cec8fe8d013b5169f042a2bf02f41b252 100644 (file)
--- a/src/osx/carbon/spinbutt.cpp
+++ b/src/osx/carbon/spinbutt.cpp
@@ -17,22 +17,22 @@
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 
 

-wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
 
     wxMacControl* peer = new wxMacControl( wxpeer );
     OSStatus err = CreateLittleArrowsControl(
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
 
     wxMacControl* peer = new wxMacControl( wxpeer );
     OSStatus err = CreateLittleArrowsControl(

-        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, value, 
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, value,

         minimum, maximum, 1, peer->GetControlRefAddr() );
     verify_noerr( err );
 
         minimum, maximum, 1, peer->GetControlRefAddr() );
     verify_noerr( err );
 

diff --git a/src/osx/carbon/srchctrl.cpp b/src/osx/carbon/srchctrl.cpp
index 099b462873699743daddf52d195fc9fd42c9adf4..1fa193c35441f77620732d49acdbb9bfba655c41 100644 (file)
--- a/src/osx/carbon/srchctrl.cpp
+++ b/src/osx/carbon/srchctrl.cpp
@@ -39,7 +39,7 @@ public :
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
                              const wxString& str,
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;

-                             
+

     // search field options
     virtual void ShowSearchButton( bool show );
     virtual bool IsSearchButtonVisible() const;
     // search field options
     virtual void ShowSearchButton( bool show );
     virtual bool IsSearchButtonVisible() const;


@@ -50,7 +50,7 @@ public :
     virtual void SetSearchMenu( wxMenu* menu );
 
     virtual void SetDescriptiveText(const wxString& text);
     virtual void SetSearchMenu( wxMenu* menu );
 
     virtual void SetDescriptiveText(const wxString& text);

-    
+

     virtual bool SetFocus();
 
 private:
     virtual bool SetFocus();
 
 private:


@@ -204,13 +204,13 @@ bool wxMacSearchFieldControl::SetFocus()
     return true;
 }
 
     return true;
 }
 

-wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& str,
                                     const wxString& str,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );
                                     long WXUNUSED(extraStyle))
 {
     wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );

diff --git a/src/osx/carbon/statbox.cpp b/src/osx/carbon/statbox.cpp
index 173b4212ca49e201630f12a08d978f5b2aacaf68..d999701476806c77049913cb7aa990f06e3e5c63 100644 (file)
--- a/src/osx/carbon/statbox.cpp
+++ b/src/osx/carbon/statbox.cpp
@@ -16,13 +16,13 @@
 #include "wx/statbox.h"
 #include "wx/osx/private.h"
 
 #include "wx/statbox.h"
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );

diff --git a/src/osx/carbon/statlmac.cpp b/src/osx/carbon/statlmac.cpp
index 77af6bb86eb887ec91d80a15a50cc33ed30ed9cb..4b272a33b14251e9a774393f5235cc5a5f423ff6 100644 (file)
--- a/src/osx/carbon/statlmac.cpp
+++ b/src/osx/carbon/statlmac.cpp
@@ -37,13 +37,13 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-wxWidgetImplType* wxWidgetImpl::CreateStaticLine( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateStaticLine( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/stattext.cpp b/src/osx/carbon/stattext.cpp
index e51b2af2b1167da54ebaf032e043393247f5ffbf..90765430e8d0bbf86160c0ccf2c679eacd6b0724 100644 (file)
--- a/src/osx/carbon/stattext.cpp
+++ b/src/osx/carbon/stattext.cpp
@@ -69,15 +69,15 @@ wxSize wxStaticText::DoGetBestSize() const
         SInt16 baseline;
         if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
         {
         SInt16 baseline;
         if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
         {

-            // GetThemeTextDimensions will cache strings and the documentation 
-            // says not to use the NoCopy string creation calls. 
-            // This also means that we can't use CFSTR without 
-            // -fno-constant-cfstrings if the library might be unloaded, 
-            // as GetThemeTextDimensions may cache a pointer to our 
-            // unloaded segment. 
-            wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "), 
+            // GetThemeTextDimensions will cache strings and the documentation
+            // says not to use the NoCopy string creation calls.
+            // This also means that we can't use CFSTR without
+            // -fno-constant-cfstrings if the library might be unloaded,
+            // as GetThemeTextDimensions may cache a pointer to our
+            // unloaded segment.
+            wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "),

                               GetFont().GetEncoding() );
                               GetFont().GetEncoding() );

-            
+

             err = GetThemeTextDimensions(
                 (CFStringRef)str,
                 m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
             err = GetThemeTextDimensions(
                 (CFStringRef)str,
                 m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );

diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp
index 01a99d65668e32abd4fa583b037e0abeb5143e21..737f6b4977bfbc58c096c9f63b5128385d36f7a7 100644 (file)
--- a/src/osx/carbon/taskbar.cpp
+++ b/src/osx/carbon/taskbar.cpp
@@ -141,7 +141,7 @@ wxDockEventHandler(EventHandlerCallRef WXUNUSED(inHandlerCallRef),
     wxDockTaskBarIcon* pTB = (wxDockTaskBarIcon*) pData;
     const UInt32 eventClass = GetEventClass(inEvent);
     const UInt32 eventKind = GetEventKind(inEvent);
     wxDockTaskBarIcon* pTB = (wxDockTaskBarIcon*) pData;
     const UInt32 eventClass = GetEventClass(inEvent);
     const UInt32 eventKind = GetEventKind(inEvent);

-    
+

     OSStatus err = eventNotHandledErr;
 
     // Handle wxTaskBar menu events (note that this is a global event handler
     OSStatus err = eventNotHandledErr;
 
     // Handle wxTaskBar menu events (note that this is a global event handler

diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index 0d71b376f6f6dbba9cc69159c689a2130d418e3b..549c81b17209fbe8ec9975435352de3a58025cb0 100644 (file)
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -223,7 +223,7 @@ class wxMacMLTEControl : public wxMacControl, public wxTextWidgetImpl
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
     ~wxMacMLTEControl() {}
 public :
     wxMacMLTEControl( wxTextCtrl *peer ) ;
     ~wxMacMLTEControl() {}

-    
+

     virtual bool        CanFocus() const
                         { return true; }
 
     virtual bool        CanFocus() const
                         { return true; }
 


@@ -332,7 +332,7 @@ public :
         return true;
     }
 
         return true;
     }
 

-    virtual void            Move(int x, int y, int width, int height); 
+    virtual void            Move(int x, int y, int width, int height);

 
 protected :
     OSStatus                 DoCreate();
 
 protected :
     OSStatus                 DoCreate();


@@ -361,13 +361,13 @@ private :
     SInt32                  m_lastVerticalValue ;
 };
 
     SInt32                  m_lastVerticalValue ;
 };
 

-wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& str,
                                     const wxString& str,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     bool forceMLTE = false ;
                                     long WXUNUSED(extraStyle))
 {
     bool forceMLTE = false ;


@@ -1732,7 +1732,7 @@ void wxMacMLTEClassicControl::MacUpdatePosition()
     }
 }
 
     }
 }
 

-void wxMacMLTEClassicControl::Move(int x, int y, int width, int height) 
+void wxMacMLTEClassicControl::Move(int x, int y, int width, int height)

 {
     wxMacControl::Move(x,y,width,height) ;
     MacUpdatePosition() ;
 {
     wxMacControl::Move(x,y,width,height) ;
     MacUpdatePosition() ;

diff --git a/src/osx/carbon/tglbtn.cpp b/src/osx/carbon/tglbtn.cpp
index 51feb614024a320795f77e49a129cee97f85c4a2..8aac11df6cf16348860fb702d231138c069ff3f7 100644 (file)
--- a/src/osx/carbon/tglbtn.cpp
+++ b/src/osx/carbon/tglbtn.cpp
@@ -26,38 +26,38 @@
 #include "wx/osx/private.h"
 // Button
 
 #include "wx/osx/private.h"
 // Button
 

-wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;

-    
+

     wxMacControl* peer = new wxMacControl(wxpeer) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

-    verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
+    verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,

         kControlBevelButtonNormalBevel , kControlBehaviorToggles , NULL , 0 , 0 , 0 , peer->GetControlRefAddr() ) );
     return peer;
 }
         kControlBevelButtonNormalBevel , kControlBehaviorToggles , NULL , 0 , 0 , 0 , peer->GetControlRefAddr() ) );
     return peer;
 }

-    
-wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID WXUNUSED(id), 
+
+wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID WXUNUSED(id),

                                     const wxBitmap& label,
                                     const wxBitmap& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
                                     long WXUNUSED(extraStyle))

-{    
+{

     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

-    
+

     ControlButtonContentInfo info;
     wxMacCreateBitmapButton( &info, label );
     ControlButtonContentInfo info;
     wxMacCreateBitmapButton( &info, label );

-    verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
+    verify_noerr ( CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,

         kControlBevelButtonNormalBevel , kControlBehaviorOffsetContents | kControlBehaviorToggles , &info , 0 , 0 , 0 , peer->GetControlRefAddr() ) );
 
     wxMacReleaseBitmapButton( &info ) ;
         kControlBevelButtonNormalBevel , kControlBehaviorOffsetContents | kControlBehaviorToggles , &info , 0 , 0 , 0 , peer->GetControlRefAddr() ) );
 
     wxMacReleaseBitmapButton( &info ) ;

diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp
index 492b45ab4675fd600f202669e91622544c876cbe..2cabb70b5ff434a90cd83e6c9f271b37b366b53b 100644 (file)
--- a/src/osx/carbon/thread.cpp
+++ b/src/osx/carbon/thread.cpp
@@ -1191,8 +1191,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 bool wxThreadModule::OnInit()
 {
 
 bool wxThreadModule::OnInit()
 {

-    bool hasThreadManager = 
-#ifdef __LP64__ 
+    bool hasThreadManager =
+#ifdef __LP64__

         true ; // TODO VERIFY IN NEXT BUILD
 #else
         MPLibraryIsLoaded();
         true ; // TODO VERIFY IN NEXT BUILD
 #else
         MPLibraryIsLoaded();

diff --git a/src/osx/carbon/tooltip.cpp b/src/osx/carbon/tooltip.cpp
index 92054cbaeeea5b6f63fb8ca7277871e2050e6ce3..0b7630ac79655d2ed8a14207ff22dcefa55f4e60 100644 (file)
--- a/src/osx/carbon/tooltip.cpp
+++ b/src/osx/carbon/tooltip.cpp
@@ -159,7 +159,7 @@ void wxToolTip::RemoveToolTips()
 }
 
 // --- mac specific
 }
 
 // --- mac specific

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

 wxMacToolTipTimer::wxMacToolTipTimer( wxMacToolTip *tip , int msec )
 {
     m_tip = tip;
 wxMacToolTipTimer::wxMacToolTipTimer( wxMacToolTip *tip , int msec )
 {
     m_tip = tip;


@@ -172,7 +172,7 @@ wxMacToolTip::wxMacToolTip()
 {
     m_window = NULL ;
     m_backpict = NULL ;
 {
     m_window = NULL ;
     m_backpict = NULL ;

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     m_timer = NULL ;
 #endif
     m_mark = 0 ;
     m_timer = NULL ;
 #endif
     m_mark = 0 ;


@@ -189,7 +189,7 @@ void wxMacToolTip::Setup( WindowRef win  , const wxString& text , const wxPoint&
     m_window =win;
     s_ToolTipWindowRef = m_window ;
     m_backpict = NULL ;
     m_window =win;
     s_ToolTipWindowRef = m_window ;
     m_backpict = NULL ;

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     delete m_timer ;
 
     m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;
     delete m_timer ;
 
     m_timer = new wxMacToolTipTimer( this , s_ToolTipDelay ) ;


@@ -198,7 +198,7 @@ void wxMacToolTip::Setup( WindowRef win  , const wxString& text , const wxPoint&
 
 wxMacToolTip::~wxMacToolTip()
 {
 
 wxMacToolTip::~wxMacToolTip()
 {

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     if ( m_timer )
     {
         delete m_timer ;
     if ( m_timer )
     {
         delete m_timer ;


@@ -250,7 +250,7 @@ void wxToolTip::NotifyWindowDelete( WXHWND win )
 void wxMacToolTip::Clear()
 {
     m_mark++ ;
 void wxMacToolTip::Clear()
 {
     m_mark++ ;

-#if wxUSE_TIMER 
+#if wxUSE_TIMER

     if ( m_timer )
     {
         delete m_timer ;
     if ( m_timer )
     {
         delete m_timer ;

diff --git a/src/osx/carbon/uma.cpp b/src/osx/carbon/uma.cpp
index 3009393821d0d48ac349650f62ffa76b630f1d72..8606c1196f6afe4d79bc83d8ef8e81b76236e821 100644 (file)
--- a/src/osx/carbon/uma.cpp
+++ b/src/osx/carbon/uma.cpp
@@ -246,12 +246,12 @@ static OSStatus UMAGetHelpMenu(
                                bool             allowHelpMenuCreation)
 {
     static bool s_createdHelpMenu = false ;
                                bool             allowHelpMenuCreation)
 {
     static bool s_createdHelpMenu = false ;

-    
+

     if ( !s_createdHelpMenu && !allowHelpMenuCreation )
     {
         return paramErr ;
     }
     if ( !s_createdHelpMenu && !allowHelpMenuCreation )
     {
         return paramErr ;
     }

-    
+

     OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
     s_createdHelpMenu = ( status == noErr ) ;
     return status ;
     OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
     s_createdHelpMenu = ( status == noErr ) ;
     return status ;

diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp
index dd44627d41a92973035fa32a96bc47f1a28141bd..32640b160cfc0e11e025f629ed2d5e6881a9a628 100644 (file)
--- a/src/osx/carbon/utils.cpp
+++ b/src/osx/carbon/utils.cpp
@@ -1031,7 +1031,7 @@ void wxMacDataItemBrowserControl::MacInsert( unsigned int n, wxMacDataItem* item
 {
     if ( m_sortOrder == SortOrder_None )
     {
 {
     if ( m_sortOrder == SortOrder_None )
     {

-        
+

         // increase the order of the lines to be shifted
         unsigned int lines = MacGetCount();
         for ( unsigned int i = n; i < lines; ++i)
         // increase the order of the lines to be shifted
         unsigned int lines = MacGetCount();
         for ( unsigned int i = n; i < lines; ++i)


@@ -1039,7 +1039,7 @@ void wxMacDataItemBrowserControl::MacInsert( unsigned int n, wxMacDataItem* item
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
             iter->SetOrder( iter->GetOrder() + 1 );
         }
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
             iter->SetOrder( iter->GetOrder() + 1 );
         }

-     
+

 #if 0
         // I don't understand what this code is supposed to do, RR.
         SInt32 frontLineOrder = 0;
 #if 0
         // I don't understand what this code is supposed to do, RR.
         SInt32 frontLineOrder = 0;


@@ -1048,7 +1048,7 @@ void wxMacDataItemBrowserControl::MacInsert( unsigned int n, wxMacDataItem* item
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
             frontLineOrder = iter->GetOrder()+1;
         }
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
             frontLineOrder = iter->GetOrder()+1;
         }

-#else   
+#else

         item->SetOrder( n );
 #endif
     }
         item->SetOrder( n );
 #endif
     }

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 1c2ec0dc70fc6a4c044e02b09f76afd19e20e7cc..c9504907ee6545af3c67f9eb0a5ec233051530ae 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -55,12 +55,12 @@ CGContextRef wxOSXGetContextFromCurrentContext()
     return context;
 }
 
     return context;
 }
 

-bool wxOSXLockFocus( WXWidget view) 
+bool wxOSXLockFocus( WXWidget view)

 {
     return [view lockFocusIfCanDraw];
 }
 
 {
     return [view lockFocusIfCanDraw];
 }
 

-void wxOSXUnlockFocus( WXWidget view) 
+void wxOSXUnlockFocus( WXWidget view)

 {
     [view unlockFocus];
 }
 {
     [view unlockFocus];
 }


@@ -144,21 +144,21 @@ WX_NSFont wxFont::OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
         wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
         wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
         bool underlined = false;
         wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
         wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
         bool underlined = false;

-        
+

         int size = (int) ([desc pointSize]+0.5);
         NSFontSymbolicTraits traits = [desc symbolicTraits];
         int size = (int) ([desc pointSize]+0.5);
         NSFontSymbolicTraits traits = [desc symbolicTraits];

-            
+

         if ( traits & NSFontBoldTrait )
             fontweight = wxFONTWEIGHT_BOLD ;
         else
             fontweight = wxFONTWEIGHT_NORMAL ;
         if ( traits & NSFontItalicTrait )
             fontstyle = wxFONTSTYLE_ITALIC ;
         if ( traits & NSFontBoldTrait )
             fontweight = wxFONTWEIGHT_BOLD ;
         else
             fontweight = wxFONTWEIGHT_NORMAL ;
         if ( traits & NSFontItalicTrait )
             fontstyle = wxFONTSTYLE_ITALIC ;

-             
+

         wxCFStringRef fontname( [desc postscriptName] );
         info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
             fontname.AsString(), wxFONTENCODING_DEFAULT);
         wxCFStringRef fontname( [desc postscriptName] );
         info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
             fontname.AsString(), wxFONTENCODING_DEFAULT);

-        
+

     }
     info->m_nsFontDescriptor = desc;
     return nsfont;
     }
     info->m_nsFontDescriptor = desc;
     return nsfont;


@@ -168,7 +168,7 @@ void wxNativeFontInfo::OSXValidateNSFontDescriptor()
 {
     NSFontDescriptor* desc  = nil;
     NSFontSymbolicTraits traits = 0;
 {
     NSFontDescriptor* desc  = nil;
     NSFontSymbolicTraits traits = 0;

-    float weight = 0; 
+    float weight = 0;

 
     if (m_weight == wxFONTWEIGHT_BOLD)
     {
 
     if (m_weight == wxFONTWEIGHT_BOLD)
     {


@@ -177,15 +177,15 @@ void wxNativeFontInfo::OSXValidateNSFontDescriptor()
     }
     else if (m_weight == wxFONTWEIGHT_LIGHT)
         weight = -1;
     }
     else if (m_weight == wxFONTWEIGHT_LIGHT)
         weight = -1;

-    
+

     if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)
         traits |= NSFontItalicTrait;
 
     desc = [NSFontDescriptor fontDescriptorWithFontAttributes:
         [[NSDictionary alloc] initWithObjectsAndKeys:
     if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)
         traits |= NSFontItalicTrait;
 
     desc = [NSFontDescriptor fontDescriptorWithFontAttributes:
         [[NSDictionary alloc] initWithObjectsAndKeys:

-            wxCFStringRef(m_faceName).AsNSString(), NSFontFamilyAttribute, 
-            [NSNumber numberWithFloat:m_pointSize], NSFontSizeAttribute, 
-            [NSNumber numberWithUnsignedInt:traits], NSFontSymbolicTrait, 
+            wxCFStringRef(m_faceName).AsNSString(), NSFontFamilyAttribute,
+            [NSNumber numberWithFloat:m_pointSize], NSFontSizeAttribute,
+            [NSNumber numberWithUnsignedInt:traits], NSFontSymbolicTrait,

             [NSNumber numberWithFloat:weight],NSFontWeightTrait,
             nil]];
 
             [NSNumber numberWithFloat:weight],NSFontWeightTrait,
             nil]];
 


@@ -237,11 +237,11 @@ WX_UIFont wxFont::OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info)
         wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
         wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
         bool underlined = false;
         wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
         wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
         bool underlined = false;

-        
+

         int size = (int) ([uifont pointSize]+0.5);
         /*
         NSFontSymbolicTraits traits = [desc symbolicTraits];
         int size = (int) ([uifont pointSize]+0.5);
         /*
         NSFontSymbolicTraits traits = [desc symbolicTraits];

-            
+

         if ( traits & NSFontBoldTrait )
             fontweight = wxFONTWEIGHT_BOLD ;
         else
         if ( traits & NSFontBoldTrait )
             fontweight = wxFONTWEIGHT_BOLD ;
         else


@@ -252,7 +252,7 @@ WX_UIFont wxFont::OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info)
         wxCFStringRef fontname( wxCFRetain([uifont familyName]) );
         info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
             fontname.AsString(), wxFONTENCODING_DEFAULT);
         wxCFStringRef fontname( wxCFRetain([uifont familyName]) );
         info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
             fontname.AsString(), wxFONTENCODING_DEFAULT);

-        
+

     }
     return uifont;
 }
     }
     return uifont;
 }


@@ -274,7 +274,7 @@ WX_UIFont wxFont::OSXCreateUIFont(const wxNativeFontInfo* info)
 
 WX_UIImage  wxOSXCreateUIImageFromCGImage( CGImageRef image )
 {
 
 WX_UIImage  wxOSXCreateUIImageFromCGImage( CGImageRef image )
 {

-    UIImage  *newImage = [UIImage imageWithCGImage:image]; 
+    UIImage  *newImage = [UIImage imageWithCGImage:image];

     [newImage autorelease];
     return( newImage );
 }
     [newImage autorelease];
     return( newImage );
 }


@@ -287,20 +287,20 @@ WX_UIImage  wxOSXCreateUIImageFromCGImage( CGImageRef image )
 WX_NSImage  wxOSXCreateNSImageFromCGImage( CGImageRef image )
 {
     NSRect      imageRect    = NSMakeRect(0.0, 0.0, 0.0, 0.0);
 WX_NSImage  wxOSXCreateNSImageFromCGImage( CGImageRef image )
 {
     NSRect      imageRect    = NSMakeRect(0.0, 0.0, 0.0, 0.0);

-    
+

     // Get the image dimensions.
     imageRect.size.height = CGImageGetHeight(image);
     imageRect.size.width = CGImageGetWidth(image);
     // Get the image dimensions.
     imageRect.size.height = CGImageGetHeight(image);
     imageRect.size.width = CGImageGetWidth(image);

-    
+

     // Create a new image to receive the Quartz image data.
     // Create a new image to receive the Quartz image data.

-    NSImage  *newImage = [[NSImage alloc] initWithSize:imageRect.size]; 
+    NSImage  *newImage = [[NSImage alloc] initWithSize:imageRect.size];

     [newImage lockFocus];
     [newImage lockFocus];

-    
+

     // Get the Quartz context and draw.
     CGContextRef  imageContext = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextDrawImage( imageContext, *(CGRect*)&imageRect, image );
     [newImage unlockFocus];
     // Get the Quartz context and draw.
     CGContextRef  imageContext = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextDrawImage( imageContext, *(CGRect*)&imageRect, image );
     [newImage unlockFocus];

-    
+

     /*
         // Create a bitmap rep from the image...
         NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
     /*
         // Create a bitmap rep from the image...
         NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];


@@ -436,7 +436,7 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
     case wxCURSOR_HAND:
         cursor = [[NSCursor pointingHandCursor] retain];
         break;
     case wxCURSOR_HAND:
         cursor = [[NSCursor pointingHandCursor] retain];
         break;

-        
+

     case wxCURSOR_BULLSEYE:
         cursor = wxGetStockCursor(kwxCursorBullseye);
         break;
     case wxCURSOR_BULLSEYE:
         cursor = wxGetStockCursor(kwxCursorBullseye);
         break;


@@ -505,19 +505,19 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
 WX_NSCursor  wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hotSpotX, float hotSpotY )
 {
     static BOOL    firstTime  = YES;
 WX_NSCursor  wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hotSpotX, float hotSpotY )
 {
     static BOOL    firstTime  = YES;

-    
+

     if ( firstTime )
     {
         //  Must first call [[[NSWindow alloc] init] release] to get the NSWindow machinery set up so that NSCursor can use a window to cache the cursor image
         [[[NSWindow alloc] init] release];
         firstTime = NO;
     }
     if ( firstTime )
     {
         //  Must first call [[[NSWindow alloc] init] release] to get the NSWindow machinery set up so that NSCursor can use a window to cache the cursor image
         [[[NSWindow alloc] init] release];
         firstTime = NO;
     }

-    
+

     NSImage    *nsImage  = wxOSXCreateNSImageFromCGImage( cgImageRef );
     NSCursor  *cursor    = [[NSCursor alloc] initWithImage:nsImage hotSpot:NSMakePoint( hotSpotX, hotSpotY )];
     NSImage    *nsImage  = wxOSXCreateNSImageFromCGImage( cgImageRef );
     NSCursor  *cursor    = [[NSCursor alloc] initWithImage:nsImage hotSpot:NSMakePoint( hotSpotX, hotSpotY )];

-    
+

     [nsImage release];
     [nsImage release];

-    
+

     return cursor;
 }
 
     return cursor;
 }
 

diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 4a0b46ecd8b5accc77586421adf7427612702c39..8ca03f2d347835862327b991120b56d41bdabd46 100644 (file)
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -80,11 +80,11 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
     m_peer->SetValue( val ) ;
 }
 
     m_peer->SetValue( val ) ;
 }
 

-bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) ) 
+bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     bool sendEvent = true;
     wxCheckBoxState newState = Get3StateValue();
 {
     bool sendEvent = true;
     wxCheckBoxState newState = Get3StateValue();

-    
+

     if ( !m_peer->ButtonClickDidStateChange() )
     {
         wxCheckBoxState origState ;
     if ( !m_peer->ButtonClickDidStateChange() )
     {
         wxCheckBoxState origState ;

diff --git a/src/osx/checklst_osx.cpp b/src/osx/checklst_osx.cpp
index 98a9b96cb5aba0ec5d1f2ab4fa84a364b3821e9e..fd1d66d478070216d797db2cbc01725779d8bca7 100644 (file)
--- a/src/osx/checklst_osx.cpp
+++ b/src/osx/checklst_osx.cpp
@@ -28,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()

- 
+

 void wxCheckListBox::Init()
 {
 }
 void wxCheckListBox::Init()
 {
 }


@@ -118,7 +118,7 @@ void wxCheckListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col ,
     if ( col == m_checkColumn )
     {
         Check( n, value.IsChecked() );
     if ( col == m_checkColumn )
     {
         Check( n, value.IsChecked() );

-        
+

         wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
         event.SetInt( n );
         event.SetString( GetString( n ) );
         wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
         event.SetInt( n );
         event.SetString( GetString( n ) );

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index 9702a7da67d1634a75ee703a90f5eacbdfd3cee4..2668c1b1cde8c34f7c7b1fcf510e7bfc6960fc66 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -72,10 +72,10 @@ bool wxChoice::Create(wxWindow *parent,
 
     if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) )
         return false;

-        
+

     m_popUpMenu = new wxMenu();
     m_popUpMenu->SetNoEventsMode(true);
     m_popUpMenu = new wxMenu();
     m_popUpMenu->SetNoEventsMode(true);

-    
+

     m_peer = wxWidgetImpl::CreateChoice( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );
     m_peer = wxWidgetImpl::CreateChoice( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );


@@ -142,7 +142,7 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
 
     if ( HasClientObjectData() )
         delete GetClientObject( n );
 
     if ( HasClientObjectData() )
         delete GetClientObject( n );

-    
+

     m_popUpMenu->Delete( m_popUpMenu->FindItemByPosition( n ) );
 
     m_strings.RemoveAt( n ) ;
     m_popUpMenu->Delete( m_popUpMenu->FindItemByPosition( n ) );
 
     m_strings.RemoveAt( n ) ;


@@ -241,7 +241,7 @@ bool wxChoice::OSXHandleClicked( double WXUNUSED(timestampsec) )
         event.SetInt( n );
         event.SetString( GetStringSelection() );
         event.SetEventObject( this );
         event.SetInt( n );
         event.SetString( GetStringSelection() );
         event.SetEventObject( this );

-        
+

         if ( HasClientObjectData() )
             event.SetClientObject( GetClientObject( n ) );
         else if ( HasClientUntypedData() )
         if ( HasClientObjectData() )
             event.SetClientObject( GetClientObject( n ) );
         else if ( HasClientUntypedData() )

diff --git a/src/osx/cocoa/bmpbuttn.mm b/src/osx/cocoa/bmpbuttn.mm
index 516b5fe857ec06bb4770b0cedbb95720efcce875..1cbc2dfa81cf5a118d919cf4958cd6cdcafda84b 100644 (file)
--- a/src/osx/cocoa/bmpbuttn.mm
+++ b/src/osx/cocoa/bmpbuttn.mm
@@ -22,14 +22,14 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxBitmap& bitmap,
                                     const wxBitmap& bitmap,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
-                                    long WXUNUSED(extraStyle)) 
+                                    long style,
+                                    long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];


@@ -46,10 +46,10 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
         else
             [v setBezelStyle:NSRegularSquareBezelStyle];
     }
         else
             [v setBezelStyle:NSRegularSquareBezelStyle];
     }

-    
+

     if (bitmap.Ok())
         [v setImage:bitmap.GetNSImage() ];
     if (bitmap.Ok())
         [v setImage:bitmap.GetNSImage() ];

-    
+

     [v setButtonType:NSMomentaryPushInButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
     [v setButtonType:NSMomentaryPushInButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;

diff --git a/src/osx/cocoa/checkbox.mm b/src/osx/cocoa/checkbox.mm
index 2f706c51c107e398195812eff427ecb8d5ac616a..23b02c033b44b36e24777e972ef11c57c6f8a082 100644 (file)
--- a/src/osx/cocoa/checkbox.mm
+++ b/src/osx/cocoa/checkbox.mm
@@ -16,22 +16,22 @@
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
-                                    long WXUNUSED(extraStyle)) 
+                                    long style,
+                                    long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 

-    [v setButtonType:NSSwitchButton];    
+    [v setButtonType:NSSwitchButton];

     if (style & wxCHK_3STATE)
         [v setAllowsMixedState:YES];
     if (style & wxCHK_3STATE)
         [v setAllowsMixedState:YES];

-        
+

     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }

diff --git a/src/osx/cocoa/choice.mm b/src/osx/cocoa/choice.mm
index 78ebecbbb9b015ced2b8651f7505133e188a251a..2ed9724dd47379ba0f8ca94a81c7f7bb30c7c15f 100644 (file)
--- a/src/osx/cocoa/choice.mm
+++ b/src/osx/cocoa/choice.mm
@@ -33,7 +33,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -52,13 +52,13 @@
 
 @end
 
 
 @end
 

-wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     wxMenu* menu,
                                     wxMenu* menu,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm
index c975bdf1e8b1eaf4ce65aab89f1550460153c803..4af807536ad6a687ffe1903435d30b885ede199b 100644 (file)
--- a/src/osx/cocoa/dialog.mm
+++ b/src/osx/cocoa/dialog.mm
@@ -45,9 +45,9 @@ void wxDialog::DoShowModal()
     }
 */
     NSWindow* theWindow = GetWXWindow();
     }
 */
     NSWindow* theWindow = GetWXWindow();

-    
+

     NSModalSession session = [NSApp beginModalSessionForWindow:theWindow];
     NSModalSession session = [NSApp beginModalSessionForWindow:theWindow];

-    while (IsModal()) 
+    while (IsModal())

     {
         wxMacAutoreleasePool autoreleasepool;
         // we cannot break based on the return value, because nested
     {
         wxMacAutoreleasePool autoreleasepool;
         // we cannot break based on the return value, because nested


@@ -55,9 +55,9 @@ void wxDialog::DoShowModal()
         // unsafe
         [NSApp runModalSession:session];
 
         // unsafe
         [NSApp runModalSession:session];
 

-        // do some idle processing 
-        if (wxTheApp) 
-            wxTheApp->ProcessIdle(); 
+        // do some idle processing
+        if (wxTheApp)
+            wxTheApp->ProcessIdle();

     }
     [NSApp endModalSession:session];
 
     }
     [NSApp endModalSession:session];
 

diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index 9ab49d86ec3e12ddd5f96a504069c32924563b63..9baab201ae0cfedb2888e407bb438374c71df973 100644 (file)
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/osx/cocoa/dirdlg.mm
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/osx/cocoa/dirdlg.mm

-// Purpose:     wxDirDialog  
+// Purpose:     wxDirDialog

 // Author:      Stefan Csomor
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     2008-08-30
 // RCS-ID:      $Id: dirdlg.mm 40007 2006-07-05 13:10:46Z SC $
 // Copyright:   (c) Stefan Csomor
 // Created:     2008-08-30
 // RCS-ID:      $Id: dirdlg.mm 40007 2006-07-05 13:10:46Z SC $
 // Copyright:   (c) Stefan Csomor


@@ -51,26 +51,26 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
 int wxDirDialog::ShowModal()
 {
     int result = wxID_CANCEL;
 int wxDirDialog::ShowModal()
 {
     int result = wxID_CANCEL;

-    
+

     NSOpenPanel *oPanel = [NSOpenPanel openPanel];
     [oPanel setCanChooseDirectories:YES];
     [oPanel setResolvesAliases:YES];
     [oPanel setCanChooseFiles:NO];
     NSOpenPanel *oPanel = [NSOpenPanel openPanel];
     [oPanel setCanChooseDirectories:YES];
     [oPanel setResolvesAliases:YES];
     [oPanel setCanChooseFiles:NO];

-    
+

     wxCFStringRef cf( m_message );
     [oPanel setMessage:cf.AsNSString()];
     wxCFStringRef cf( m_message );
     [oPanel setMessage:cf.AsNSString()];

- 
-    if ( HasFlag(wxDD_NEW_DIR_BUTTON) ) 
+
+    if ( HasFlag(wxDD_NEW_DIR_BUTTON) )

         [oPanel setCanCreateDirectories:YES];
 
     wxCFStringRef dir( m_path );
         [oPanel setCanCreateDirectories:YES];
 
     wxCFStringRef dir( m_path );

-    
+

     m_path = wxEmptyString;
 
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;
     m_path = wxEmptyString;
 
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;

-    
-    if (GetParent()) 
+
+    if (GetParent())

     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }
     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }


@@ -79,14 +79,14 @@ int wxDirDialog::ShowModal()
         fprintf(stderr, "No parent!\n");
     }
 
         fprintf(stderr, "No parent!\n");
     }
 

-/*    
+/*

     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();
     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();

-        ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-        [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil 
-            modalForWindow: nativeParent modalDelegate: sheetDelegate 
-            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+        ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+        [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil
+            modalForWindow: nativeParent modalDelegate: sheetDelegate
+            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

             contextInfo: nil];
         [sheetDelegate waitForSheetToFinish];
         returnCode = [sheetDelegate code];
             contextInfo: nil];
         [sheetDelegate waitForSheetToFinish];
         returnCode = [sheetDelegate code];

diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index 4a9d65fbc9d84457c59a57711d168580c67ed221..33ece870253945a8d0389d5b6fdad8ce9562491f 100644 (file)
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -153,11 +153,11 @@ int wxFileDialog::ShowModal()
 
     m_path = wxEmptyString;
     m_fileNames.Clear();
 
     m_path = wxEmptyString;
     m_fileNames.Clear();

-    
+

     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;

-    
-    if (GetParent()) 
+
+    if (GetParent())

     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }
     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }


@@ -181,10 +181,10 @@ int wxFileDialog::ShowModal()
         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();

-            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-            [sPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString() 
-                modalForWindow: nativeParent modalDelegate: sheetDelegate 
-                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+            [sPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
+                modalForWindow: nativeParent modalDelegate: sheetDelegate
+                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];
                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];


@@ -195,7 +195,7 @@ int wxFileDialog::ShowModal()
         {
             returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
         }
         {
             returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
         }

-        
+

         if (returnCode == NSOKButton )
         {
             panel = sPanel;
         if (returnCode == NSOKButton )
         {
             panel = sPanel;


@@ -220,11 +220,11 @@ int wxFileDialog::ShowModal()
         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();

-            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-            [oPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString() 
-                types: types modalForWindow: nativeParent 
-                modalDelegate: sheetDelegate 
-                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+            [oPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
+                types: types modalForWindow: nativeParent
+                modalDelegate: sheetDelegate
+                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];
                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];


@@ -233,7 +233,7 @@ int wxFileDialog::ShowModal()
         else
 */
         {
         else
 */
         {

-            returnCode = [oPanel runModalForDirectory:dir.AsNSString() 
+            returnCode = [oPanel runModalForDirectory:dir.AsNSString()

                         file:file.AsNSString() types:types];
         }
         if (returnCode == NSOKButton )
                         file:file.AsNSString() types:types];
         }
         if (returnCode == NSOKButton )

diff --git a/src/osx/cocoa/gauge.mm b/src/osx/cocoa/gauge.mm
index ad4ace7a479df9daa71f17889fc60c31c8a29299..e9c35f40b55da84f337c4defc7a3f19f6396c4b9 100644 (file)
--- a/src/osx/cocoa/gauge.mm
+++ b/src/osx/cocoa/gauge.mm
@@ -28,7 +28,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -43,19 +43,19 @@ public :
     wxOSXGaugeCocoaImpl( wxWindowMac* peer, WXWidget w) : wxWidgetCocoaImpl( peer, w )
     {
     }
     wxOSXGaugeCocoaImpl( wxWindowMac* peer, WXWidget w) : wxWidgetCocoaImpl( peer, w )
     {
     }

-    
+

     void SetMaximum(wxInt32 v)
     {
         SetDeterminateMode();
         wxWidgetCocoaImpl::SetMaximum( v ) ;
     }
     void SetMaximum(wxInt32 v)
     {
         SetDeterminateMode();
         wxWidgetCocoaImpl::SetMaximum( v ) ;
     }

-    
+

     void SetValue(wxInt32 v)
     {
         SetDeterminateMode();
         wxWidgetCocoaImpl::SetValue( v ) ;
     }
     void SetValue(wxInt32 v)
     {
         SetDeterminateMode();
         wxWidgetCocoaImpl::SetValue( v ) ;
     }

-    
+

     void PulseGauge()
     {
         if ( ![(wxNSProgressIndicator*)m_osxView isIndeterminate] )
     void PulseGauge()
     {
         if ( ![(wxNSProgressIndicator*)m_osxView isIndeterminate] )


@@ -77,15 +77,15 @@ protected:
 };
 
 
 };
 
 

-wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

diff --git a/src/osx/cocoa/glcanvas.mm b/src/osx/cocoa/glcanvas.mm
index f07fc0f64a39235d27f62fd8d4dacfdd8f08516b..4c5f6ec1e5a6a7d96fdc268c43ff099811e650a7 100644 (file)
--- a/src/osx/cocoa/glcanvas.mm
+++ b/src/osx/cocoa/glcanvas.mm
@@ -224,13 +224,13 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList)
 bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
 {
     if ( !m_glContext )
 bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
 {
     if ( !m_glContext )

-        return false;  
+        return false;

 
     [m_glContext setView: win.GetHandle() ];
     [m_glContext update];
 
     [m_glContext setView: win.GetHandle() ];
     [m_glContext update];

-    
+

     [m_glContext makeCurrentContext];
     [m_glContext makeCurrentContext];

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -246,7 +246,7 @@ bool wxGLContext::SetCurrent(const wxGLCanvas& win) const
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );

diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index ded09fb1e69de8c5b02de0f8e46f3a54c52121de..e517ba97af0b2a6f38da0c7d9c09e1882a0957ad 100644 (file)
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -38,14 +38,14 @@ class wxListWidgetCocoaImpl;
     wxListWidgetCocoaImpl* impl;
 }
 
     wxListWidgetCocoaImpl* impl;
 }
 

-- (id)tableView:(NSTableView *)aTableView 
-        objectValueForTableColumn:(NSTableColumn *)aTableColumn 
+- (id)tableView:(NSTableView *)aTableView
+        objectValueForTableColumn:(NSTableColumn *)aTableColumn

         row:(NSInteger)rowIndex;
 
         row:(NSInteger)rowIndex;
 

-- (void)tableView:(NSTableView *)aTableView 
-        setObjectValue:(id)value forTableColumn:(NSTableColumn *)aTableColumn 
+- (void)tableView:(NSTableView *)aTableView
+        setObjectValue:(id)value forTableColumn:(NSTableColumn *)aTableColumn

         row:(NSInteger)rowIndex;
         row:(NSInteger)rowIndex;

-        
+

 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
 
 - (void)setImplementation: (wxListWidgetCocoaImpl *) theImplementation;
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
 
 - (void)setImplementation: (wxListWidgetCocoaImpl *) theImplementation;


@@ -79,19 +79,19 @@ class wxCocoaTableColumn;
 class WXDLLIMPEXP_CORE wxCocoaTableColumn : public wxListWidgetColumn
 {
 public :
 class WXDLLIMPEXP_CORE wxCocoaTableColumn : public wxListWidgetColumn
 {
 public :

-    wxCocoaTableColumn( wxNSTableColumn* column, bool editable ) 
+    wxCocoaTableColumn( wxNSTableColumn* column, bool editable )

         : m_column( column ), m_editable(editable)
     {
     }
         : m_column( column ), m_editable(editable)
     {
     }

-    
+

     ~wxCocoaTableColumn()
     {
     }
     ~wxCocoaTableColumn()
     {
     }

-    
+

     wxNSTableColumn* GetNSTableColumn() const { return m_column ; }
     wxNSTableColumn* GetNSTableColumn() const { return m_column ; }

-    
+

     bool IsEditable() const { return m_editable; }
     bool IsEditable() const { return m_editable; }

-    
+

 protected :
     wxNSTableColumn* m_column;
     bool m_editable;
 protected :
     wxNSTableColumn* m_column;
     bool m_editable;


@@ -103,31 +103,31 @@ class wxListWidgetCocoaImpl : public wxWidgetCocoaImpl, public wxListWidgetImpl
 {
 public :
     wxListWidgetCocoaImpl( wxWindowMac* peer, NSScrollView* view, wxNSTableView* tableview, wxNSTableDataSource* data );
 {
 public :
     wxListWidgetCocoaImpl( wxWindowMac* peer, NSScrollView* view, wxNSTableView* tableview, wxNSTableDataSource* data );

-    
+

     ~wxListWidgetCocoaImpl();
     ~wxListWidgetCocoaImpl();

-    
-    virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false, 
+
+    virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,

                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1)  ;
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1)  ;

-    virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false, 
+    virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,

                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1)  ;
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1)  ;

-    
+

     // add and remove
     // add and remove

-    
-    virtual void            ListDelete( unsigned int n ) ;    
+
+    virtual void            ListDelete( unsigned int n ) ;

     virtual void            ListInsert( unsigned int n ) ;
     virtual void            ListClear() ;
 
     // selecting
 
     virtual void            ListDeselectAll();
     virtual void            ListInsert( unsigned int n ) ;
     virtual void            ListClear() ;
 
     // selecting
 
     virtual void            ListDeselectAll();

-    
+

     virtual void            ListSetSelection( unsigned int n, bool select, bool multi ) ;
     virtual int             ListGetSelection() const ;
     virtual void            ListSetSelection( unsigned int n, bool select, bool multi ) ;
     virtual int             ListGetSelection() const ;

-    
+

     virtual int             ListGetSelections( wxArrayInt& aSelections ) const ;
     virtual int             ListGetSelections( wxArrayInt& aSelections ) const ;

-    
+

     virtual bool            ListIsSelected( unsigned int n ) const ;
     virtual bool            ListIsSelected( unsigned int n ) const ;

-    
+

     // display
 
     virtual void            ListScrollTo( unsigned int n ) ;
     // display
 
     virtual void            ListScrollTo( unsigned int n ) ;


@@ -135,7 +135,7 @@ public :
     // accessing content
 
     virtual unsigned int    ListGetCount() const ;
     // accessing content
 
     virtual unsigned int    ListGetCount() const ;

-    
+

     int                     ListGetColumnType( int col )
     {
         return col;
     int                     ListGetColumnType( int col )
     {
         return col;


@@ -147,7 +147,7 @@ public :
     virtual void            controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
 protected :
     wxNSTableView*          m_tableView ;
     virtual void            controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
 protected :
     wxNSTableView*          m_tableView ;

-    
+

     wxNSTableDataSource*    m_dataSource;
 } ;
 
     wxNSTableDataSource*    m_dataSource;
 } ;
 


@@ -182,38 +182,38 @@ public :
     wxNSTableViewCellValue( id &v ) : value(v)
     {
     }
     wxNSTableViewCellValue( id &v ) : value(v)
     {
     }

-    
+

     virtual ~wxNSTableViewCellValue() {}
 
     virtual void Set( CFStringRef v )
     {
         value = [[(NSString*)v retain] autorelease];
     }
     virtual ~wxNSTableViewCellValue() {}
 
     virtual void Set( CFStringRef v )
     {
         value = [[(NSString*)v retain] autorelease];
     }

-    virtual void Set( const wxString& value ) 
+    virtual void Set( const wxString& value )

     {
         Set( (CFStringRef) wxCFStringRef( value ) );
     }
     {
         Set( (CFStringRef) wxCFStringRef( value ) );
     }

-    virtual void Set( int v ) 
+    virtual void Set( int v )

     {
         value = [NSNumber numberWithInt:v];
     }
     {
         value = [NSNumber numberWithInt:v];
     }

-    
-    virtual int GetIntValue() const 
+
+    virtual int GetIntValue() const

     {
         if ( [value isKindOfClass:[NSNumber class]] )
             return [ (NSNumber*) value intValue ];
     {
         if ( [value isKindOfClass:[NSNumber class]] )
             return [ (NSNumber*) value intValue ];

-            
+

         return 0;
     }
         return 0;
     }

-    
-    virtual wxString GetStringValue() const 
+
+    virtual wxString GetStringValue() const

     {
         if ( [value isKindOfClass:[NSString class]] )
             return wxCFStringRef::AsString( (NSString*) value );
     {
         if ( [value isKindOfClass:[NSString class]] )
             return wxCFStringRef::AsString( (NSString*) value );

-            
+

         return wxEmptyString;
     }
         return wxEmptyString;
     }

-        
+

 protected:
     id& value;
 } ;
 protected:
     id& value;
 } ;


@@ -245,8 +245,8 @@ protected:
     return 0;
 }
 
     return 0;
 }
 

-- (id)tableView:(NSTableView *)aTableView 
-        objectValueForTableColumn:(NSTableColumn *)aTableColumn 
+- (id)tableView:(NSTableView *)aTableView
+        objectValueForTableColumn:(NSTableColumn *)aTableColumn

         row:(NSInteger)rowIndex
 {
     wxUnusedVar(aTableView);
         row:(NSInteger)rowIndex
 {
     wxUnusedVar(aTableView);


@@ -259,8 +259,8 @@ protected:
     return value;
 }
 
     return value;
 }
 

-- (void)tableView:(NSTableView *)aTableView 
-        setObjectValue:(id)value forTableColumn:(NSTableColumn *)aTableColumn 
+- (void)tableView:(NSTableView *)aTableView
+        setObjectValue:(id)value forTableColumn:(NSTableColumn *)aTableColumn

         row:(NSInteger)rowIndex
 {
     wxUnusedVar(aTableView);
         row:(NSInteger)rowIndex
 {
     wxUnusedVar(aTableView);


@@ -278,7 +278,7 @@ protected:
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -302,7 +302,7 @@ wxListWidgetCocoaImpl::~wxListWidgetCocoaImpl()
     [m_dataSource release];
 }
 
     [m_dataSource release];
 }
 

-unsigned int wxListWidgetCocoaImpl::ListGetCount() const 
+unsigned int wxListWidgetCocoaImpl::ListGetCount() const

 {
     wxListBox* lb = dynamic_cast<wxListBox*> ( GetWXPeer() );
     return lb->GetCount();
 {
     wxListBox* lb = dynamic_cast<wxListBox*> ( GetWXPeer() );
     return lb->GetCount();


@@ -312,19 +312,19 @@ unsigned int wxListWidgetCocoaImpl::ListGetCount() const
 // columns
 //
 
 // columns
 //
 

-wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const wxString& WXUNUSED(title), bool editable, 
-                                wxAlignment WXUNUSED(just), int defaultWidth) 
+wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const wxString& WXUNUSED(title), bool editable,
+                                wxAlignment WXUNUSED(just), int defaultWidth)

 {
     wxNSTableColumn* col1 = [[wxNSTableColumn alloc] init];
     [col1 setEditable:editable];
 {
     wxNSTableColumn* col1 = [[wxNSTableColumn alloc] init];
     [col1 setEditable:editable];

-    
+

     unsigned formerColCount = [m_tableView numberOfColumns];
     unsigned formerColCount = [m_tableView numberOfColumns];

-    
+

     // there's apparently no way to insert at a specific position
     [m_tableView addTableColumn:col1 ];
     if ( pos < formerColCount )
         [m_tableView moveColumn:formerColCount toColumn:pos];
     // there's apparently no way to insert at a specific position
     [m_tableView addTableColumn:col1 ];
     if ( pos < formerColCount )
         [m_tableView moveColumn:formerColCount toColumn:pos];

-        
+

     if ( defaultWidth >= 0 )
     {
         [col1 setMaxWidth:defaultWidth];
     if ( defaultWidth >= 0 )
     {
         [col1 setMaxWidth:defaultWidth];


@@ -333,7 +333,7 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const
     }
     else
     {
     }
     else
     {

-        [col1 setMaxWidth:1000];        
+        [col1 setMaxWidth:1000];

         [col1 setMinWidth:10];
         // temporary hack, because I cannot get the automatic column resizing
         // to work properly
         [col1 setMinWidth:10];
         // temporary hack, because I cannot get the automatic column resizing
         // to work properly


@@ -348,33 +348,33 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertTextColumn( unsigned pos, const
     return wxcol;
 }
 
     return wxcol;
 }
 

-wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , const wxString& WXUNUSED(title), bool editable, 
-                                wxAlignment WXUNUSED(just), int defaultWidth ) 
+wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , const wxString& WXUNUSED(title), bool editable,
+                                wxAlignment WXUNUSED(just), int defaultWidth )

 {
    wxNSTableColumn* col1 = [[wxNSTableColumn alloc] init];
     [col1 setEditable:editable];
 {
    wxNSTableColumn* col1 = [[wxNSTableColumn alloc] init];
     [col1 setEditable:editable];

- 
+

     // set your custom cell & set it up
     NSButtonCell* checkbox = [[NSButtonCell alloc] init];
     [checkbox setTitle:@""];
     [checkbox setButtonType:NSSwitchButton];
     [col1 setDataCell:checkbox] ;
     [checkbox release];
     // set your custom cell & set it up
     NSButtonCell* checkbox = [[NSButtonCell alloc] init];
     [checkbox setTitle:@""];
     [checkbox setButtonType:NSSwitchButton];
     [col1 setDataCell:checkbox] ;
     [checkbox release];

-             
+

     unsigned formerColCount = [m_tableView numberOfColumns];
     unsigned formerColCount = [m_tableView numberOfColumns];

-    
+

     // there's apparently no way to insert at a specific position
     [m_tableView addTableColumn:col1 ];
     if ( pos < formerColCount )
         [m_tableView moveColumn:formerColCount toColumn:pos];
     // there's apparently no way to insert at a specific position
     [m_tableView addTableColumn:col1 ];
     if ( pos < formerColCount )
         [m_tableView moveColumn:formerColCount toColumn:pos];

-        
+

     if ( defaultWidth >= 0 )
     {
         [col1 setMaxWidth:defaultWidth];
         [col1 setMinWidth:defaultWidth];
         [col1 setWidth:defaultWidth];
     }
     if ( defaultWidth >= 0 )
     {
         [col1 setMaxWidth:defaultWidth];
         [col1 setMinWidth:defaultWidth];
         [col1 setWidth:defaultWidth];
     }

-    
+

     [col1 setResizingMask: NSTableColumnNoResizing];
     wxCocoaTableColumn* wxcol = new wxCocoaTableColumn( col1, editable );
     [col1 setColumn:wxcol];
     [col1 setResizingMask: NSTableColumnNoResizing];
     wxCocoaTableColumn* wxcol = new wxCocoaTableColumn( col1, editable );
     [col1 setColumn:wxcol];


@@ -389,17 +389,17 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , con
 // inserting / removing lines
 //
 
 // inserting / removing lines
 //
 

-void wxListWidgetCocoaImpl::ListInsert( unsigned int WXUNUSED(n) ) 
+void wxListWidgetCocoaImpl::ListInsert( unsigned int WXUNUSED(n) )

 {
     [m_tableView reloadData];
 }
 
 {
     [m_tableView reloadData];
 }
 

-void wxListWidgetCocoaImpl::ListDelete( unsigned int WXUNUSED(n) ) 
+void wxListWidgetCocoaImpl::ListDelete( unsigned int WXUNUSED(n) )

 {
     [m_tableView reloadData];
 }
 
 {
     [m_tableView reloadData];
 }
 

-void wxListWidgetCocoaImpl::ListClear() 
+void wxListWidgetCocoaImpl::ListClear()

 {
     [m_tableView reloadData];
 }
 {
     [m_tableView reloadData];
 }


@@ -411,7 +411,7 @@ void wxListWidgetCocoaImpl::ListDeselectAll()
     [m_tableView deselectAll:nil];
 }
 
     [m_tableView deselectAll:nil];
 }
 

-void wxListWidgetCocoaImpl::ListSetSelection( unsigned int n, bool select, bool multi ) 
+void wxListWidgetCocoaImpl::ListSetSelection( unsigned int n, bool select, bool multi )

 {
     // TODO
     if ( select )
 {
     // TODO
     if ( select )


@@ -421,12 +421,12 @@ void wxListWidgetCocoaImpl::ListSetSelection( unsigned int n, bool select, bool
 
 }
 
 
 }
 

-int wxListWidgetCocoaImpl::ListGetSelection() const 
+int wxListWidgetCocoaImpl::ListGetSelection() const

 {
     return [m_tableView selectedRow];
 }
 
 {
     return [m_tableView selectedRow];
 }
 

-int wxListWidgetCocoaImpl::ListGetSelections( wxArrayInt& aSelections ) const 
+int wxListWidgetCocoaImpl::ListGetSelections( wxArrayInt& aSelections ) const

 {
     aSelections.Empty();
 
 {
     aSelections.Empty();
 


@@ -441,26 +441,26 @@ int wxListWidgetCocoaImpl::ListGetSelections( wxArrayInt& aSelections ) const
     return aSelections.Count();
 }
 
     return aSelections.Count();
 }
 

-bool wxListWidgetCocoaImpl::ListIsSelected( unsigned int n ) const 
+bool wxListWidgetCocoaImpl::ListIsSelected( unsigned int n ) const

 {
     return [m_tableView isRowSelected:n];
 }
 
 // display
 
 {
     return [m_tableView isRowSelected:n];
 }
 
 // display
 

-void wxListWidgetCocoaImpl::ListScrollTo( unsigned int n ) 
+void wxListWidgetCocoaImpl::ListScrollTo( unsigned int n )

 {
     [m_tableView scrollRowToVisible:n];
 }
 
 {
     [m_tableView scrollRowToVisible:n];
 }
 

-    
-void wxListWidgetCocoaImpl::UpdateLine( unsigned int WXUNUSED(n), wxListWidgetColumn* WXUNUSED(col) ) 
+
+void wxListWidgetCocoaImpl::UpdateLine( unsigned int WXUNUSED(n), wxListWidgetColumn* WXUNUSED(col) )

 {
     // TODO optimize
     [m_tableView reloadData];
 }
 
 {
     // TODO optimize
     [m_tableView reloadData];
 }
 

-void wxListWidgetCocoaImpl::UpdateLineToEnd( unsigned int WXUNUSED(n)) 
+void wxListWidgetCocoaImpl::UpdateLineToEnd( unsigned int WXUNUSED(n))

 {
     // TODO optimize
     [m_tableView reloadData];
 {
     // TODO optimize
     [m_tableView reloadData];


@@ -476,7 +476,7 @@ void wxListWidgetCocoaImpl::controlAction(WXWidget WXUNUSED(slf),void* WXUNUSED(
     int sel = [m_tableView clickedRow];
     if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
        return;
     int sel = [m_tableView clickedRow];
     if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
        return;

-       
+

     list->HandleLineEvent( sel, false );
 }
 
     list->HandleLineEvent( sel, false );
 }
 


@@ -495,41 +495,41 @@ void wxListWidgetCocoaImpl::controlDoubleAction(WXWidget WXUNUSED(slf),void* WXU
 // accessing content
 
 
 // accessing content
 
 

-wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     NSScrollView* scrollview = [[NSScrollView alloc] initWithFrame:r];
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     NSScrollView* scrollview = [[NSScrollView alloc] initWithFrame:r];

-    
+

     // use same scroll flags logic as msw
     // use same scroll flags logic as msw

-    
+

     [scrollview setHasVerticalScroller:YES];
     [scrollview setHasVerticalScroller:YES];

-    
+

     if ( style & wxLB_HSCROLL )
         [scrollview setHasHorizontalScroller:YES];
     if ( style & wxLB_HSCROLL )
         [scrollview setHasHorizontalScroller:YES];

-    
+

     [scrollview setAutohidesScrollers: ((style & wxLB_ALWAYS_SB) ? NO : YES)];
 
     // setting up the true table
     [scrollview setAutohidesScrollers: ((style & wxLB_ALWAYS_SB) ? NO : YES)];
 
     // setting up the true table

-    
+

     wxNSTableView* tableview = [[wxNSTableView alloc] init];
     // only one multi-select mode available
     if ( (style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE) )
         [tableview setAllowsMultipleSelection:YES];
     wxNSTableView* tableview = [[wxNSTableView alloc] init];
     // only one multi-select mode available
     if ( (style & wxLB_EXTENDED) || (style & wxLB_MULTIPLE) )
         [tableview setAllowsMultipleSelection:YES];

-        
+

     // simple listboxes have no header row
     [tableview setHeaderView:nil];
     // simple listboxes have no header row
     [tableview setHeaderView:nil];

-    
+

     if ( style & wxLB_HSCROLL )
         [tableview setColumnAutoresizingStyle:NSTableViewNoColumnAutoresizing];
     else
         [tableview setColumnAutoresizingStyle:NSTableViewLastColumnOnlyAutoresizingStyle];
     if ( style & wxLB_HSCROLL )
         [tableview setColumnAutoresizingStyle:NSTableViewNoColumnAutoresizing];
     else
         [tableview setColumnAutoresizingStyle:NSTableViewLastColumnOnlyAutoresizingStyle];

-        
+

     wxNSTableDataSource* ds = [[ wxNSTableDataSource alloc] init];
     [tableview setDataSource:ds];
     [scrollview setDocumentView:tableview];
     wxNSTableDataSource* ds = [[ wxNSTableDataSource alloc] init];
     [tableview setDataSource:ds];
     [scrollview setDocumentView:tableview];

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 34cd2079e2e5daabe7bbcfd51e61e72542b9f60d..aff7a283e18e28b0a4334d5cb1d2e16bdc5c7365 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -117,11 +117,11 @@
 
 @end
 
 
 @end
 

-@interface NSApplication(MissingAppleMenuCall) 
-- (void)setAppleMenu:(NSMenu *)menu; 
-@end 
+@interface NSApplication(MissingAppleMenuCall)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end

 
 

-class wxMenuCocoaImpl : public wxMenuImpl 
+class wxMenuCocoaImpl : public wxMenuImpl

 {
 public :
     wxMenuCocoaImpl( wxMenu* peer , wxNSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
 {
 public :
     wxMenuCocoaImpl( wxMenu* peer , wxNSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)


@@ -138,22 +138,22 @@ public :
             CFRetain(m_osxMenu);
         [m_osxMenu release];
     }
             CFRetain(m_osxMenu);
         [m_osxMenu release];
     }

-    
+

     virtual ~wxMenuCocoaImpl();
     virtual ~wxMenuCocoaImpl();

-        
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) 
+
+    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos)

     {
         if ( pos == (size_t) -1 )
             [m_osxMenu addItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() ];
         else
             [m_osxMenu insertItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() atIndex:pos];
     }
     {
         if ( pos == (size_t) -1 )
             [m_osxMenu addItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() ];
         else
             [m_osxMenu insertItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem() atIndex:pos];
     }

-        
-    virtual void Remove( wxMenuItem *pItem ) 
+
+    virtual void Remove( wxMenuItem *pItem )

     {
         [m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
     }
     {
         [m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
     }

-    
+

     virtual void MakeRoot()
     {
         [NSApp setMainMenu:m_osxMenu];
     virtual void MakeRoot()
     {
         [NSApp setMainMenu:m_osxMenu];


@@ -163,7 +163,7 @@ public :
     virtual void Enable( bool WXUNUSED(enable) )
     {
     }
     virtual void Enable( bool WXUNUSED(enable) )
     {
     }

-    
+

     virtual void SetTitle( const wxString& text )
     {
         wxCFStringRef cfText(text);
     virtual void SetTitle( const wxString& text )
     {
         wxCFStringRef cfText(text);

diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm
index b8f33fc0cc900c47825dee76e2a01a21a6664f01..680d3c0cc73b66939c1f239bff43fb054895f309 100644 (file)
--- a/src/osx/cocoa/menuitem.mm
+++ b/src/osx/cocoa/menuitem.mm
@@ -168,7 +168,7 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
     }
 }
 
     }
 }
 

-class wxMenuItemCocoaImpl : public wxMenuItemImpl 
+class wxMenuItemCocoaImpl : public wxMenuItemImpl

 {
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)
 {
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)


@@ -176,24 +176,24 @@ public :
         if ( ![m_osxMenuItem isSeparatorItem] )
             [(wxNSMenuItem*)m_osxMenuItem setImplementation:this];
     }
         if ( ![m_osxMenuItem isSeparatorItem] )
             [(wxNSMenuItem*)m_osxMenuItem setImplementation:this];
     }

-    
+

     ~wxMenuItemCocoaImpl();
     ~wxMenuItemCocoaImpl();

-        
-    void SetBitmap( const wxBitmap& bitmap ) 
+
+    void SetBitmap( const wxBitmap& bitmap )

     {
         [m_osxMenuItem setImage:bitmap.GetNSImage()];
     }
     {
         [m_osxMenuItem setImage:bitmap.GetNSImage()];
     }

-    
-    void Enable( bool enable ) 
+
+    void Enable( bool enable )

     {
         [m_osxMenuItem setEnabled:enable];
     }
     {
         [m_osxMenuItem setEnabled:enable];
     }

-    
-    void Check( bool check ) 
+
+    void Check( bool check )

     {
         [m_osxMenuItem setState:( check ?  NSOnState :  NSOffState) ];
     }
     {
         [m_osxMenuItem setState:( check ?  NSOnState :  NSOffState) ];
     }

-    
+

     void Hide( bool hide )
     {
         // NB: setHidden is new as of 10.5 so we should not call it below there
     void Hide( bool hide )
     {
         // NB: setHidden is new as of 10.5 so we should not call it below there


@@ -202,17 +202,17 @@ public :
         else
             wxLogDebug("wxMenuItemCocoaImpl::Hide not yet supported under OS X < 10.5");
     }
         else
             wxLogDebug("wxMenuItemCocoaImpl::Hide not yet supported under OS X < 10.5");
     }

-    
-    void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) 
+
+    void SetLabel( const wxString& text, wxAcceleratorEntry *entry )

     {
         wxCFStringRef cfText(text);
         [m_osxMenuItem setTitle:cfText.AsNSString()];
     {
         wxCFStringRef cfText(text);
         [m_osxMenuItem setTitle:cfText.AsNSString()];

-        
+

         if ( entry )
             wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
 
     }
         if ( entry )
             wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
 
     }

-    
+

     void * GetHMenuItem() { return m_osxMenuItem; }
 
 protected :
     void * GetHMenuItem() { return m_osxMenuItem; }
 
 protected :


@@ -236,7 +236,7 @@ wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,
 {
     wxMenuItemImpl* c = NULL;
     NSMenuItem* item = nil;
 {
     wxMenuItemImpl* c = NULL;
     NSMenuItem* item = nil;

-    
+

     if ( kind == wxITEM_SEPARATOR )
     {
         item = [[NSMenuItem separatorItem] retain];
     if ( kind == wxITEM_SEPARATOR )
     {
         item = [[NSMenuItem separatorItem] retain];

diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm
index ab6ffb99e6981151ebdf5e0867c4a7f2a424fcaf..504e019070a81bdb081363cf6416054c792ad00e 100644 (file)
--- a/src/osx/cocoa/msgdlg.mm
+++ b/src/osx/cocoa/msgdlg.mm
@@ -133,7 +133,7 @@ int wxMessageDialog::ShowModal()
     else
     {
         NSAlert* alert = [[NSAlert alloc] init];
     else
     {
         NSAlert* alert = [[NSAlert alloc] init];

-        
+

         wxCFStringRef cfNoString( GetNoLabel(), GetFont().GetEncoding() );
         wxCFStringRef cfYesString( GetYesLabel(), GetFont().GetEncoding() );
         wxCFStringRef cfOKString( GetOKLabel(), GetFont().GetEncoding() );
         wxCFStringRef cfNoString( GetNoLabel(), GetFont().GetEncoding() );
         wxCFStringRef cfYesString( GetYesLabel(), GetFont().GetEncoding() );
         wxCFStringRef cfOKString( GetOKLabel(), GetFont().GetEncoding() );


@@ -144,7 +144,7 @@ int wxMessageDialog::ShowModal()
 
         [alert setMessageText:cfTitle.AsNSString()];
         [alert setInformativeText:cfText.AsNSString()];
 
         [alert setMessageText:cfTitle.AsNSString()];
         [alert setInformativeText:cfText.AsNSString()];

-        
+

         int buttonId[3] = { 0, 0, 0 };
         int buttonCount = 0;
 
         int buttonId[3] = { 0, 0, 0 };
         int buttonCount = 0;
 


@@ -186,19 +186,19 @@ int wxMessageDialog::ShowModal()
 
         wxNonOwnedWindow* parentWindow = NULL;
         int button = -1;
 
         wxNonOwnedWindow* parentWindow = NULL;
         int button = -1;

-                
-        if (GetParent()) 
+
+        if (GetParent())

         {
             parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
         }
         {
             parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
         }

- 
+

  /*
         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
  /*
         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();

-            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-            [alert beginSheetModalForWindow: nativeParent modalDelegate: sheetDelegate 
-                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+            [alert beginSheetModalForWindow: nativeParent modalDelegate: sheetDelegate
+                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             button = [sheetDelegate code];
                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             button = [sheetDelegate code];


@@ -210,7 +210,7 @@ int wxMessageDialog::ShowModal()
             button = [alert runModal];
         }
         [alert release];
             button = [alert runModal];
         }
         [alert release];

-        
+

         if ( button < NSAlertFirstButtonReturn )
             resultbutton = wxID_CANCEL;
         else
         if ( button < NSAlertFirstButtonReturn )
             resultbutton = wxID_CANCEL;
         else

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index c37765cd5c0dff309a5eb39e0e8a408d00d7e8ce..de474588265978c3a809bd00dd84c26620e6ff9e 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -59,7 +59,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 
 bool shouldHandleSelector(SEL selector)
 {
 
 bool shouldHandleSelector(SEL selector)
 {

-    if (selector == @selector(noop:) 
+    if (selector == @selector(noop:)

             || selector == @selector(complete:)
             || selector == @selector(deleteBackward:)
             || selector == @selector(deleteForward:)
             || selector == @selector(complete:)
             || selector == @selector(deleteBackward:)
             || selector == @selector(deleteForward:)


@@ -72,7 +72,7 @@ bool shouldHandleSelector(SEL selector)
             || selector == @selector(scrollToBeginningOfDocument:)
             || selector == @selector(scrollToEndOfDocument:))
         return false;
             || selector == @selector(scrollToBeginningOfDocument:)
             || selector == @selector(scrollToEndOfDocument:))
         return false;

-        
+

     return true;
 
 }
     return true;
 
 }


@@ -107,7 +107,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 - (void)doCommandBySelector:(SEL)selector
 {
 
 - (void)doCommandBySelector:(SEL)selector
 {

-    if (shouldHandleSelector(selector) && 
+    if (shouldHandleSelector(selector) &&

         !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) )
         [super doCommandBySelector:selector];
 }
         !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) )
         [super doCommandBySelector:selector];
 }


@@ -137,7 +137,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 - (void)noResponderFor: (SEL) selector;
 @end
 
 - (void)noResponderFor: (SEL) selector;
 @end
 

-@implementation wxNSPanel 
+@implementation wxNSPanel

 
 - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
 {
 
 - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
 {


@@ -281,8 +281,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
         if ( wxpeer )
         {
             wxpeer->HandleActivated(0, false);
         if ( wxpeer )
         {
             wxpeer->HandleActivated(0, false);

-            // Needed for popup window since the firstResponder 
-            // (focus in wx) doesn't change when this 
+            // Needed for popup window since the firstResponder
+            // (focus in wx) doesn't change when this

             // TLW becomes inactive.
             wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
             event.SetEventObject(wxpeer);
             // TLW becomes inactive.
             wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
             event.SetEventObject(wxpeer);


@@ -315,19 +315,19 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
 

-wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) : 
+wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) :

     wxNonOwnedWindowImpl(nonownedwnd)
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }
     wxNonOwnedWindowImpl(nonownedwnd)
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }

-    
-wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl() 
+
+wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl()

 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }

-    
+

 wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {
     [m_macWindow setImplementation:nil];
 wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {
     [m_macWindow setImplementation:nil];


@@ -344,23 +344,23 @@ void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), const wxPoin
 long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;
 long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;

-    
+

     if ( !controller )
         controller =[[wxNonOwnedWindowController alloc] init];
 
 
     int windowstyle = NSBorderlessWindowMask;
     if ( !controller )
         controller =[[wxNonOwnedWindowController alloc] init];
 
 
     int windowstyle = NSBorderlessWindowMask;

-    
-    if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) || 
+
+    if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) ||

             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
     {
         m_macWindow = [wxNSPanel alloc];
     }
     else
         m_macWindow = [wxNSWindow alloc];
             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
     {
         m_macWindow = [wxNSPanel alloc];
     }
     else
         m_macWindow = [wxNSWindow alloc];

-    
+

     CGWindowLevel level = kCGNormalWindowLevel;
     CGWindowLevel level = kCGNormalWindowLevel;

-    
+

     if ( style & wxFRAME_TOOL_WINDOW )
     {
         windowstyle |= NSUtilityWindowMask;
     if ( style & wxFRAME_TOOL_WINDOW )
     {
         windowstyle |= NSUtilityWindowMask;


@@ -437,21 +437,21 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     if ( ( style & wxSTAY_ON_TOP ) )
         level = kCGUtilityWindowLevel;
 
     if ( ( style & wxSTAY_ON_TOP ) )
         level = kCGUtilityWindowLevel;

-    
+

     NSRect r = wxToNSRect( NULL, wxRect( pos, size) );
     NSRect r = wxToNSRect( NULL, wxRect( pos, size) );

-    
+

     [m_macWindow setImplementation:this];
     [m_macWindow setImplementation:this];

-    
+

     [m_macWindow initWithContentRect:r
         styleMask:windowstyle
         backing:NSBackingStoreBuffered
     [m_macWindow initWithContentRect:r
         styleMask:windowstyle
         backing:NSBackingStoreBuffered

-        defer:NO 
+        defer:NO

         ];
         ];

-        
+

     [m_macWindow setLevel:level];
 
     [m_macWindow setDelegate:controller];
     [m_macWindow setLevel:level];
 
     [m_macWindow setDelegate:controller];

-    
+

     [m_macWindow setAcceptsMouseMovedEvents: YES];
 }
 
     [m_macWindow setAcceptsMouseMovedEvents: YES];
 }
 


@@ -465,7 +465,7 @@ void wxNonOwnedWindowCocoaImpl::Raise()
 {
     [m_macWindow orderWindow:NSWindowAbove relativeTo:0];
 }
 {
     [m_macWindow orderWindow:NSWindowAbove relativeTo:0];
 }

-    
+

 void wxNonOwnedWindowCocoaImpl::Lower()
 {
     [m_macWindow orderWindow:NSWindowBelow relativeTo:0];
 void wxNonOwnedWindowCocoaImpl::Lower()
 {
     [m_macWindow orderWindow:NSWindowBelow relativeTo:0];


@@ -478,11 +478,11 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
         [m_macWindow makeKeyAndOrderFront:nil];
         [[m_macWindow contentView] setNeedsDisplay:YES];
     }
         [m_macWindow makeKeyAndOrderFront:nil];
         [[m_macWindow contentView] setNeedsDisplay:YES];
     }

-    else 
+    else

         [m_macWindow orderOut:nil];
     return true;
 }
         [m_macWindow orderOut:nil];
     return true;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
 {
     return Show(show);
 bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
 {
     return Show(show);


@@ -517,15 +517,15 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
         else if ( !metal && (windowStyle & NSTexturedBackgroundWindowMask ) )
         {
             wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );
         else if ( !metal && (windowStyle & NSTexturedBackgroundWindowMask ) )
         {
             wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );

-        }        
+        }

     }
 }
     }
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
 {
     return true;
 }
 bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
 {
     return true;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::CanSetTransparent()
 {
     return true;
 bool wxNonOwnedWindowCocoaImpl::CanSetTransparent()
 {
     return true;


@@ -562,27 +562,27 @@ void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width,
     width = (int)rect.size.width;
     height = (int)rect.size.height;
 }
     width = (int)rect.size.width;
     height = (int)rect.size.height;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region))
 {
     return false;
 }
 
 bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region))
 {
     return false;
 }
 

-void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) 
+void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding encoding )

 {
     [m_macWindow setTitle:wxCFStringRef( title , encoding ).AsNSString()];
 }
 {
     [m_macWindow setTitle:wxCFStringRef( title , encoding ).AsNSString()];
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::IsMaximized() const
 {
     return [m_macWindow isZoomed];
 }
 bool wxNonOwnedWindowCocoaImpl::IsMaximized() const
 {
     return [m_macWindow isZoomed];
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::IsIconized() const
 {
     return [m_macWindow isMiniaturized];
 }
 bool wxNonOwnedWindowCocoaImpl::IsIconized() const
 {
     return [m_macWindow isMiniaturized];
 }

-    
+

 void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
 {
     if ( iconize )
 void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
 {
     if ( iconize )


@@ -590,12 +590,12 @@ void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
     else
         [m_macWindow deminiaturize:nil];
 }
     else
         [m_macWindow deminiaturize:nil];
 }

-    
+

 void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 {
     [m_macWindow zoom:nil];
 }
 void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 {
     [m_macWindow zoom:nil];
 }

-    
+

 
 // http://cocoadevcentral.com/articles/000028.php
 
 
 // http://cocoadevcentral.com/articles/000028.php
 


@@ -609,7 +609,7 @@ bool wxNonOwnedWindowCocoaImpl::IsFullScreen() const
 {
     return m_macFullScreenData != NULL ;
 }
 {
     return m_macFullScreenData != NULL ;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
 {
     if ( show )
 bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
 {
     if ( show )


@@ -634,7 +634,7 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
         delete data ;
         m_macFullScreenData = NULL ;
     }
         delete data ;
         m_macFullScreenData = NULL ;
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -650,7 +650,7 @@ void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y )
     nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil];
     p = wxFromNSPoint([m_macWindow contentView], nspt);
     if ( x )
     nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil];
     p = wxFromNSPoint([m_macWindow contentView], nspt);
     if ( x )

-        *x = p.x; 
+        *x = p.x;

     if ( y )
         *y = p.y;
 }
     if ( y )
         *y = p.y;
 }

diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm
index b62b66e6f1a8923095391644c658bcbe88386312..a23bf5157a992ba1f1ac71096d05c41185bc7987 100644 (file)
--- a/src/osx/cocoa/notebook.mm
+++ b/src/osx/cocoa/notebook.mm
@@ -86,7 +86,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -101,8 +101,8 @@ public:
     wxCocoaTabView( wxWindowMac* peer , WXWidget w ) : wxWidgetCocoaImpl(peer, w)
     {
     }
     wxCocoaTabView( wxWindowMac* peer , WXWidget w ) : wxWidgetCocoaImpl(peer, w)
     {
     }

-    
-    void GetContentArea( int &left , int &top , int &width , int &height ) const 
+
+    void GetContentArea( int &left , int &top , int &width , int &height ) const

     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;
         NSRect r = [slf contentRect];
     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;
         NSRect r = [slf contentRect];


@@ -111,8 +111,8 @@ public:
         width = (int)r.size.width;
         height = (int)r.size.height;
     }
         width = (int)r.size.width;
         height = (int)r.size.height;
     }

-    
-    void SetValue( wxInt32 value ) 
+
+    void SetValue( wxInt32 value )

     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;
         // avoid 'changed' events when setting the tab programmatically
     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;
         // avoid 'changed' events when setting the tab programmatically


@@ -121,7 +121,7 @@ public:
         [slf selectTabViewItemAtIndex:(value-1)];
         [slf setDelegate:controller];
     }
         [slf selectTabViewItemAtIndex:(value-1)];
         [slf setDelegate:controller];
     }

-    
+

     wxInt32 GetValue() const
     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;
     wxInt32 GetValue() const
     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;


@@ -131,7 +131,7 @@ public:
         else
             return [slf indexOfTabViewItem:selectedItem]+1;
     }
         else
             return [slf indexOfTabViewItem:selectedItem]+1;
     }

-    
+

     void SetMaximum( wxInt32 maximum )
     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;
     void SetMaximum( wxInt32 maximum )
     {
         wxNSTabView* slf = (wxNSTabView*) m_osxView;


@@ -139,7 +139,7 @@ public:
         // avoid 'changed' events when setting the tab programmatically
         wxTabViewController* controller = [slf delegate];
         [slf setDelegate:nil];
         // avoid 'changed' events when setting the tab programmatically
         wxTabViewController* controller = [slf delegate];
         [slf setDelegate:nil];

-        
+

         if ( maximum > cocoacount )
         {
             for ( int i = cocoacount ; i < maximum ; ++i )
         if ( maximum > cocoacount )
         {
             for ( int i = cocoacount ; i < maximum ; ++i )


@@ -163,9 +163,9 @@ public:
     void SetupTabs( const wxNotebook& notebook)
     {
         int pcount = notebook.GetPageCount();
     void SetupTabs( const wxNotebook& notebook)
     {
         int pcount = notebook.GetPageCount();

-        
+

         SetMaximum( pcount );
         SetMaximum( pcount );

-        
+

         for ( int i = 0 ; i < pcount ; ++i )
         {
             wxNotebookPage* page = notebook.GetPage(i);
         for ( int i = 0 ; i < pcount ; ++i )
         {
             wxNotebookPage* page = notebook.GetPage(i);


@@ -226,12 +226,12 @@ public:
     verify_noerr( err );
 #endif
 */
     verify_noerr( err );
 #endif
 */

-wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     static wxTabViewController* controller = NULL;
                                     long WXUNUSED(extraStyle))
 {
     static wxTabViewController* controller = NULL;


@@ -240,7 +240,7 @@ wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
         controller =[[wxTabViewController alloc] init];
 
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
         controller =[[wxTabViewController alloc] init];
 
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

-    
+

     NSTabViewType tabstyle = NSTopTabsBezelBorder;
     if ( style & wxBK_LEFT )
         tabstyle = NSLeftTabsBezelBorder;
     NSTabViewType tabstyle = NSTopTabsBezelBorder;
     if ( style & wxBK_LEFT )
         tabstyle = NSLeftTabsBezelBorder;


@@ -248,7 +248,7 @@ wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
         tabstyle = NSRightTabsBezelBorder;
     else if ( style & wxBK_BOTTOM )
         tabstyle = NSBottomTabsBezelBorder;
         tabstyle = NSRightTabsBezelBorder;
     else if ( style & wxBK_BOTTOM )
         tabstyle = NSBottomTabsBezelBorder;

-    
+

     wxNSTabView* v = [[wxNSTabView alloc] initWithFrame:r];
     [v setTabViewType:tabstyle];
     wxWidgetCocoaImpl* c = new wxCocoaTabView( wxpeer, v );
     wxNSTabView* v = [[wxNSTabView alloc] initWithFrame:r];
     [v setTabViewType:tabstyle];
     wxWidgetCocoaImpl* c = new wxCocoaTabView( wxpeer, v );

diff --git a/src/osx/cocoa/printdlg.mm b/src/osx/cocoa/printdlg.mm
index d10cea723a970cd1fbd07a3827a3ae52966ac729..c307a028bab00fbb3c796e9a80b0acbdbc75b76e 100644 (file)
--- a/src/osx/cocoa/printdlg.mm
+++ b/src/osx/cocoa/printdlg.mm
@@ -64,7 +64,7 @@ int wxMacPrintDialog::ShowModal()
     m_printDialogData.GetPrintData().ConvertToNative();
 
     int result = wxID_CANCEL;
     m_printDialogData.GetPrintData().ConvertToNative();
 
     int result = wxID_CANCEL;

-    
+

     NSPrintPanel* panel = [NSPrintPanel printPanel];
     NSPrintInfo* printInfo = ((wxOSXCocoaPrintData*)m_printDialogData.GetPrintData().GetNativeData())->GetNSPrintInfo();
     if ( (NSInteger)[panel runModalWithPrintInfo:printInfo] == NSOKButton )
     NSPrintPanel* panel = [NSPrintPanel printPanel];
     NSPrintInfo* printInfo = ((wxOSXCocoaPrintData*)m_printDialogData.GetPrintData().GetNativeData())->GetNSPrintInfo();
     if ( (NSInteger)[panel runModalWithPrintInfo:printInfo] == NSOKButton )


@@ -92,7 +92,7 @@ int wxMacPageSetupDialog::ShowModal()
         m_pageSetupData.GetPrintData().ConvertFromNative();
         m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() );
     }
         m_pageSetupData.GetPrintData().ConvertFromNative();
         m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() );
     }

-    
+

     return result;
 }
 
     return result;
 }
 

diff --git a/src/osx/cocoa/radiobut.mm b/src/osx/cocoa/radiobut.mm
index 195860144b4372acf3a6811f6a621aaea56bcb0e..a64d2875e46f0c4ea722bcaf7abdcc12b00e3bea 100644 (file)
--- a/src/osx/cocoa/radiobut.mm
+++ b/src/osx/cocoa/radiobut.mm
@@ -2,7 +2,7 @@
 // Name:        src/osx/cocoa/radiobut.mm
 // Purpose:     wxRadioButton
 // Author:      Stefan Csomor
 // Name:        src/osx/cocoa/radiobut.mm
 // Purpose:     wxRadioButton
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     ??/??/98
 // RCS-ID:      $Id: radiobut.cpp 54129 2008-06-11 19:30:52Z SC $
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id: radiobut.cpp 54129 2008-06-11 19:30:52Z SC $
 // Copyright:   (c) AUTHOR


@@ -16,20 +16,20 @@
 #include "wx/radiobut.h"
 #include "wx/osx/private.h"
 
 #include "wx/radiobut.h"
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
 

-    [v setButtonType:NSRadioButton];    
-        
+    [v setButtonType:NSRadioButton];
+

     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }

diff --git a/src/osx/cocoa/scrolbar.mm b/src/osx/cocoa/scrolbar.mm
index 4814d87f64284cd688b04b951698a584d86cf812..dd9c9e18dcc3f2faacfeb82dff099c76f676ab84 100644 (file)
--- a/src/osx/cocoa/scrolbar.mm
+++ b/src/osx/cocoa/scrolbar.mm
@@ -32,7 +32,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods(self);
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods(self);


@@ -48,13 +48,13 @@ public :
     {
         m_maximum = 1;
     }
     {
         m_maximum = 1;
     }

-    
+

     void SetMaximum(wxInt32 v)
     {
         m_maximum = (v == 0) ? 1 : v;
     }
     void SetMaximum(wxInt32 v)
     {
         m_maximum = (v == 0) ? 1 : v;
     }

-    
-    void    SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) 
+
+    void    SetScrollThumb( wxInt32 value, wxInt32 thumbSize )

     {
         double v = ((double) value)/m_maximum;
         double t = ((double) thumbSize)/(m_maximum+thumbSize);
     {
         double v = ((double) value)/m_maximum;
         double t = ((double) thumbSize)/(m_maximum+thumbSize);


@@ -65,12 +65,12 @@ public :
         [(wxNSScroller*) m_osxView setKnobProportion:t];
 #endif
     }
         [(wxNSScroller*) m_osxView setKnobProportion:t];
 #endif
     }

-    
+

     virtual wxInt32 GetValue() const
     {
         return wxRound([(wxNSScroller*) m_osxView floatValue] * m_maximum);
     }
     virtual wxInt32 GetValue() const
     {
         return wxRound([(wxNSScroller*) m_osxView floatValue] * m_maximum);
     }

-    
+

     virtual wxInt32 GetMaximum() const
     {
         return m_maximum;
     virtual wxInt32 GetMaximum() const
     {
         return m_maximum;


@@ -82,16 +82,16 @@ protected:
     wxInt32 m_maximum;
 };
 
     wxInt32 m_maximum;
 };
 

-// we will have a mouseDown, then in the native 
+// we will have a mouseDown, then in the native

 // implementation of mouseDown the tracking code
 // is calling clickedAction, therefore we wire this
 // implementation of mouseDown the tracking code
 // is calling clickedAction, therefore we wire this

-// to thumbtrack and only after super mouseDown 
+// to thumbtrack and only after super mouseDown

 // returns we will call the thumbrelease
 
 void wxOSXScrollBarCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))
 {
     wxEventType scrollEvent = wxEVT_NULL;
 // returns we will call the thumbrelease
 
 void wxOSXScrollBarCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))
 {
     wxEventType scrollEvent = wxEVT_NULL;

-    switch ([(NSScroller*)m_osxView hitPart]) 
+    switch ([(NSScroller*)m_osxView hitPart])

     {
     case NSScrollerIncrementLine:
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
     {
     case NSScrollerIncrementLine:
         scrollEvent = wxEVT_SCROLL_LINEDOWN;


@@ -122,7 +122,7 @@ void wxOSXScrollBarCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNU
 void wxOSXScrollBarCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     wxWidgetCocoaImpl::mouseEvent(event, slf, _cmd);
 void wxOSXScrollBarCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     wxWidgetCocoaImpl::mouseEvent(event, slf, _cmd);

-    
+

     // send a release event in case we've been tracking the thumb
     if ( strcmp( sel_getName((SEL) _cmd) , "mouseDown:") == 0 )
     {
     // send a release event in case we've been tracking the thumb
     if ( strcmp( sel_getName((SEL) _cmd) , "mouseDown:") == 0 )
     {


@@ -136,16 +136,16 @@ void wxOSXScrollBarCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_
     }
 }
 
     }
 }
 

-wxWidgetImplType* wxWidgetImpl::CreateScrollBar( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateScrollBar( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

-    // the creation rect defines the orientation 
+    // the creation rect defines the orientation

     NSRect createRect = ( style & wxSB_HORIZONTAL ) ? NSMakeRect(r.origin.x, r.origin.y , 17, 16) :
         NSMakeRect(r.origin.x, r.origin.y , 16, 17);
     wxNSScroller* v = [[wxNSScroller alloc] initWithFrame:createRect];
     NSRect createRect = ( style & wxSB_HORIZONTAL ) ? NSMakeRect(r.origin.x, r.origin.y , 17, 16) :
         NSMakeRect(r.origin.x, r.origin.y , 16, 17);
     wxNSScroller* v = [[wxNSScroller alloc] initWithFrame:createRect];

diff --git a/src/osx/cocoa/slider.mm b/src/osx/cocoa/slider.mm
index 90ea3f7274ce1fd6feeaba896d228de197f878ab..fbde6dc22a2f1b777e8047a8a26936526107ff2d 100644 (file)
--- a/src/osx/cocoa/slider.mm
+++ b/src/osx/cocoa/slider.mm
@@ -26,7 +26,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods(self);
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods(self);


@@ -42,7 +42,7 @@ public :
         wxWidgetCocoaImpl(peer, w)
     {
     }
         wxWidgetCocoaImpl(peer, w)
     {
     }

-    
+

     ~wxSliderCocoaImpl()
     {
     }
     ~wxSliderCocoaImpl()
     {
     }


@@ -51,10 +51,10 @@ public :
     virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
 };
 
     virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
 };
 

-// we will have a mouseDown, then in the native 
+// we will have a mouseDown, then in the native

 // implementation of mouseDown the tracking code
 // is calling clickedAction, therefore we wire this
 // implementation of mouseDown the tracking code
 // is calling clickedAction, therefore we wire this

-// to thumbtrack and only after super mouseDown 
+// to thumbtrack and only after super mouseDown

 // returns we will call the thumbrelease
 
 void wxSliderCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))
 // returns we will call the thumbrelease
 
 void wxSliderCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))


@@ -67,7 +67,7 @@ void wxSliderCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_c
 void wxSliderCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     wxWidgetCocoaImpl::mouseEvent(event, slf, _cmd);
 void wxSliderCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
     wxWidgetCocoaImpl::mouseEvent(event, slf, _cmd);

-    
+

     if ( strcmp( sel_getName((SEL) _cmd) , "mouseDown:") == 0 )
     {
         wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( strcmp( sel_getName((SEL) _cmd) , "mouseDown:") == 0 )
     {
         wxWindow* wxpeer = (wxWindow*) GetWXPeer();


@@ -78,15 +78,15 @@ void wxSliderCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 
 
 
 
 
 

-wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;


@@ -101,7 +101,7 @@ wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer,
         // it to a UInt16
         while (tickMarks > 20)
             tickMarks /= 5;
         // it to a UInt16
         while (tickMarks > 20)
             tickMarks /= 5;

-            
+

         [v setNumberOfTickMarks:tickMarks];
         [v setTickMarkPosition:NSTickMarkBelow];
     }
         [v setNumberOfTickMarks:tickMarks];
         [v setTickMarkPosition:NSTickMarkBelow];
     }

diff --git a/src/osx/cocoa/spinbutt.mm b/src/osx/cocoa/spinbutt.mm
index 6511abb5f4362b8ed92d54c83701fa26af88eb4a..4230bad5e9b1d036e7a9c435b1f3776750a7de73 100644 (file)
--- a/src/osx/cocoa/spinbutt.mm
+++ b/src/osx/cocoa/spinbutt.mm
@@ -26,7 +26,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods(self);
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods(self);


@@ -43,7 +43,7 @@ public :
     {
         m_formerValue = 0;
     }
     {
         m_formerValue = 0;
     }

-    
+

     ~wxSpinButtonCocoaImpl()
     {
     }
     ~wxSpinButtonCocoaImpl()
     {
     }


@@ -56,7 +56,7 @@ private:
 
 void wxSpinButtonCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {
 
 void wxSpinButtonCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 {

-    
+

     // send a release event in case we've been tracking the thumb
     if ( strcmp( sel_getName((SEL) _cmd) , "mouseDown:") == 0 )
     {
     // send a release event in case we've been tracking the thumb
     if ( strcmp( sel_getName((SEL) _cmd) , "mouseDown:") == 0 )
     {


@@ -71,19 +71,19 @@ void wxSpinButtonCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSE
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer )
     {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer )
     {

-        // because wx expects to be able to veto 
+        // because wx expects to be able to veto

         // a change we must revert the value change
         // and expose it
         int currentValue = [(NSStepper*)m_osxView intValue];
         [(NSStepper*)m_osxView setIntValue:m_formerValue];
         int inc = currentValue-m_formerValue;
         // a change we must revert the value change
         // and expose it
         int currentValue = [(NSStepper*)m_osxView intValue];
         [(NSStepper*)m_osxView setIntValue:m_formerValue];
         int inc = currentValue-m_formerValue;

-        
+

         // adjust for wrap arounds
         if ( inc > 1 )
             inc = -1;
         else if (inc < -1 )
             inc = 1;
         // adjust for wrap arounds
         if ( inc > 1 )
             inc = -1;
         else if (inc < -1 )
             inc = 1;

-            
+

         if ( inc == 1 )
             wxpeer->TriggerScrollEvent(wxEVT_SCROLL_LINEUP);
         else if ( inc == -1 )
         if ( inc == 1 )
             wxpeer->TriggerScrollEvent(wxEVT_SCROLL_LINEUP);
         else if ( inc == -1 )


@@ -93,15 +93,15 @@ void wxSpinButtonCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSE
     }
 }
 
     }
 }
 

-wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;


@@ -110,10 +110,10 @@ wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer,
     [v setMinValue: minimum];
     [v setMaxValue: maximum];
     [v setIntValue: value];
     [v setMinValue: minimum];
     [v setMaxValue: maximum];
     [v setIntValue: value];

-    
+

     if ( style & wxSP_WRAP )
         [v setValueWraps:YES];
     if ( style & wxSP_WRAP )
         [v setValueWraps:YES];

-    
+

     wxWidgetCocoaImpl* c = new wxSpinButtonCocoaImpl( wxpeer, v );
     return c;
 }
     wxWidgetCocoaImpl* c = new wxSpinButtonCocoaImpl( wxpeer, v );
     return c;
 }

diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm
index 6b761d7f97c4939072cbe439e52ebb454e55723f..399729c1832fccec8b4e55530a4e015c769b39b6 100644 (file)
--- a/src/osx/cocoa/srchctrl.mm
+++ b/src/osx/cocoa/srchctrl.mm
@@ -40,7 +40,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -102,7 +102,7 @@ public :
             [m_searchFieldCell setSearchButtonCell:nil];
         [m_searchField setNeedsDisplay:YES];
     }
             [m_searchFieldCell setSearchButtonCell:nil];
         [m_searchField setNeedsDisplay:YES];
     }

-    
+

     virtual bool IsSearchButtonVisible() const
     {
         return [m_searchFieldCell searchButtonCell] != nil;
     virtual bool IsSearchButtonVisible() const
     {
         return [m_searchFieldCell searchButtonCell] != nil;


@@ -116,7 +116,7 @@ public :
             [m_searchFieldCell setCancelButtonCell:nil];
         [m_searchField setNeedsDisplay:YES];
     }
             [m_searchFieldCell setCancelButtonCell:nil];
         [m_searchField setNeedsDisplay:YES];
     }

-    
+

     virtual bool IsCancelButtonVisible() const
     {
         return [m_searchFieldCell cancelButtonCell] != nil;
     virtual bool IsCancelButtonVisible() const
     {
         return [m_searchFieldCell cancelButtonCell] != nil;


@@ -136,7 +136,7 @@ public :
         [m_searchFieldCell setPlaceholderString:
             wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
     }
         [m_searchFieldCell setPlaceholderString:
             wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
     }

-        
+

     virtual bool SetFocus()
     {
        return  wxNSTextFieldControl::SetFocus();
     virtual bool SetFocus()
     {
        return  wxNSTextFieldControl::SetFocus();


@@ -151,13 +151,13 @@ wxNSSearchFieldControl::~wxNSSearchFieldControl()
 {
 }
 
 {
 }
 

-wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& str,
                                     const wxString& str,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

diff --git a/src/osx/cocoa/statbox.mm b/src/osx/cocoa/statbox.mm
index d36fde1d357fabd4a8038f20abacfb1bfaa4e95f..aad08e0f76e64a7bf06ea20ef08b665467615ea9 100644 (file)
--- a/src/osx/cocoa/statbox.mm
+++ b/src/osx/cocoa/statbox.mm
@@ -21,7 +21,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -30,7 +30,7 @@
 
 @end
 
 
 @end
 

-namespace 
+namespace

 {
     class wxStaticBoxCocoaImpl : public wxWidgetCocoaImpl
     {
 {
     class wxStaticBoxCocoaImpl : public wxWidgetCocoaImpl
     {


@@ -39,35 +39,35 @@ namespace
         : wxWidgetCocoaImpl(wxpeer, v)
         {
         }
         : wxWidgetCocoaImpl(wxpeer, v)
         {
         }

-        
+

         virtual void SetLabel( const wxString& title, wxFontEncoding encoding )
         {
             if (title.empty())
                 [GetNSBox() setTitlePosition:NSNoTitle];
             else
                 [GetNSBox() setTitlePosition:NSAtTop];
         virtual void SetLabel( const wxString& title, wxFontEncoding encoding )
         {
             if (title.empty())
                 [GetNSBox() setTitlePosition:NSNoTitle];
             else
                 [GetNSBox() setTitlePosition:NSAtTop];

-            
+

             wxWidgetCocoaImpl::SetLabel(title, encoding);
         }
             wxWidgetCocoaImpl::SetLabel(title, encoding);
         }

-        
+

     private:
         NSBox *GetNSBox() const
         {
             wxASSERT( [m_osxView isKindOfClass:[NSBox class]] );
     private:
         NSBox *GetNSBox() const
         {
             wxASSERT( [m_osxView isKindOfClass:[NSBox class]] );

-            
+

             return static_cast<NSBox*>(m_osxView);
         }
     };
 } // anonymous namespace
 
 
             return static_cast<NSBox*>(m_osxView);
         }
     };
 } // anonymous namespace
 
 

-wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;

diff --git a/src/osx/cocoa/statline.mm b/src/osx/cocoa/statline.mm
index d793adbe3f252efb6b523a63188dc7777365db5d..ea94dcd6dca56cdad8bd891723878b0d66fe0fe4 100644 (file)
--- a/src/osx/cocoa/statline.mm
+++ b/src/osx/cocoa/statline.mm
@@ -33,13 +33,13 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateStaticLine( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateStaticLine( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSBox* v = [[wxNSBox alloc] initWithFrame:r];
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSBox* v = [[wxNSBox alloc] initWithFrame:r];

diff --git a/src/osx/cocoa/stattext.mm b/src/osx/cocoa/stattext.mm
index da93c8ac63e3d7b8576c3d83588748befdb08a10..b9f812e308c59376348aa9f292d71bfd4721487d 100644 (file)
--- a/src/osx/cocoa/stattext.mm
+++ b/src/osx/cocoa/stattext.mm
@@ -38,8 +38,8 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
-    {    
+    if (!initialized)
+    {

         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     }
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     }


@@ -54,9 +54,9 @@ public:
     {
         m_lineBreak = lineBreak;
     }
     {
         m_lineBreak = lineBreak;
     }

-    
-    virtual void SetLabel(const wxString& title, wxFontEncoding encoding) 
-    { 
+
+    virtual void SetLabel(const wxString& title, wxFontEncoding encoding)
+    {

         wxNSStaticTextView* v = (wxNSStaticTextView*)GetWXWidget();
         wxWindow* wxpeer = GetWXPeer();
         NSCell* cell = [v cell];
         wxNSStaticTextView* v = (wxNSStaticTextView*)GetWXWidget();
         wxWindow* wxpeer = GetWXPeer();
         NSCell* cell = [v cell];


@@ -69,7 +69,7 @@ public:
             [paragraphStyle setAlignment: NSCenterTextAlignment];
         else if (style & wxALIGN_RIGHT)
             [paragraphStyle setAlignment: NSRightTextAlignment];
             [paragraphStyle setAlignment: NSCenterTextAlignment];
         else if (style & wxALIGN_RIGHT)
             [paragraphStyle setAlignment: NSRightTextAlignment];

-    
+

         NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:paragraphStyle, NSParagraphStyleAttributeName, nil];
         NSAttributedString *attrstring = [[NSAttributedString alloc] initWithString:text.AsNSString() attributes:dict];
         [cell setAttributedStringValue:attrstring];
         NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:paragraphStyle, NSParagraphStyleAttributeName, nil];
         NSAttributedString *attrstring = [[NSAttributedString alloc] initWithString:text.AsNSString() attributes:dict];
         [cell setAttributedStringValue:attrstring];


@@ -102,7 +102,7 @@ wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
     [v setSelectable: NO];
     [v setBezeled:NO];
     [v setBordered:NO];
     [v setSelectable: NO];
     [v setBezeled:NO];
     [v setBordered:NO];

-    
+

     NSLineBreakMode linebreak = NSLineBreakByWordWrapping;
     if ( ((wxStaticText*)wxpeer)->IsEllipsized() )
     {
     NSLineBreakMode linebreak = NSLineBreakByWordWrapping;
     if ( ((wxStaticText*)wxpeer)->IsEllipsized() )
     {


@@ -113,11 +113,11 @@ wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
         else if (style & wxST_ELLIPSIZE_START )
             linebreak = NSLineBreakByTruncatingHead;
     }
         else if (style & wxST_ELLIPSIZE_START )
             linebreak = NSLineBreakByTruncatingHead;
     }

-    else 
+    else

     {
         [[v cell] setWraps:YES];
     }
     {
         [[v cell] setWraps:YES];
     }

-            
+

     wxWidgetCocoaImpl* c = new wxStaticTextCocoaImpl( wxpeer, v, linebreak );
     return c;
 }
     wxWidgetCocoaImpl* c = new wxStaticTextCocoaImpl( wxpeer, v, linebreak );
     return c;
 }

diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm
index 00486c89229cedac197f232b52bd9179cbec4f7d..2f5762665c233105375fe75e8e58f762ef5b0d31 100644 (file)
--- a/src/osx/cocoa/taskbar.mm
+++ b/src/osx/cocoa/taskbar.mm
@@ -48,9 +48,9 @@ public:
     inline wxTaskBarIcon* GetTaskBarIcon() { return m_taskBarIcon; }
     wxMenu * CreatePopupMenu()
     { return m_taskBarIcon->CreatePopupMenu(); }
     inline wxTaskBarIcon* GetTaskBarIcon() { return m_taskBarIcon; }
     wxMenu * CreatePopupMenu()
     { return m_taskBarIcon->CreatePopupMenu(); }

-    
+

     wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl);
     wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl);

-    
+

 protected:
     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;
 protected:
     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;


@@ -162,7 +162,7 @@ wxTaskBarIcon::~wxTaskBarIcon()
 // Operations
 
 bool wxTaskBarIcon::IsIconInstalled() const
 // Operations
 
 bool wxTaskBarIcon::IsIconInstalled() const

-{ 
+{

     return false;
 }
 
     return false;
 }
 

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 77a6ba4d0261926a1bdd2bd7148063f860afa5d6..14bfab4447cc8ee365b228cf4033ce4bd93c2d76 100644 (file)
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -49,7 +49,7 @@
 #include "wx/osx/private.h"
 #include "wx/osx/cocoa/private/textimpl.h"
 
 #include "wx/osx/private.h"
 #include "wx/osx/cocoa/private/textimpl.h"
 

-@interface NSView(EditableView) 
+@interface NSView(EditableView)

 - (BOOL)isEditable;
 - (void)setEditable:(BOOL)flag;
 @end
 - (BOOL)isEditable;
 - (void)setEditable:(BOOL)flag;
 @end


@@ -78,12 +78,12 @@ protected :
     NSView* m_textView;
 } ;
 
     NSView* m_textView;
 } ;
 

-@implementation wxNSSecureTextField 
+@implementation wxNSSecureTextField

 
 + (void)initialize
 {
     static BOOL initialized = NO;
 
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -128,8 +128,8 @@ protected :
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
-    {    
+    if (!initialized)
+    {

         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     }
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     }


@@ -184,7 +184,7 @@ protected :
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -198,7 +198,7 @@ protected :
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -273,7 +273,7 @@ typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl
         if ( impl  )
         {
             wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( impl  )
         {
             wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();

-            if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER ) 
+            if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER )

             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
                 event.SetEventObject( wxpeer );
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
                 event.SetEventObject( wxpeer );


@@ -282,7 +282,7 @@ typedef BOOL (*wxOSX_insertNewlineHandlerPtr)(NSView* self, SEL _cmd, NSControl
             }
         }
     }
             }
         }
     }

-    
+

     return NO;
 }
 
     return NO;
 }
 


@@ -303,24 +303,24 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w ) : wxW
 {
     wxNSTextScrollView* sv = (wxNSTextScrollView*) w;
     m_scrollView = sv;
 {
     wxNSTextScrollView* sv = (wxNSTextScrollView*) w;
     m_scrollView = sv;

-    
+

     [m_scrollView setHasVerticalScroller:YES];
     [m_scrollView setHasHorizontalScroller:NO];
     [m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     NSSize contentSize = [m_scrollView contentSize];
     [m_scrollView setHasVerticalScroller:YES];
     [m_scrollView setHasHorizontalScroller:NO];
     [m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
     NSSize contentSize = [m_scrollView contentSize];

-    
+

     wxNSTextView* tv = [[wxNSTextView alloc] initWithFrame: NSMakeRect(0, 0,
             contentSize.width, contentSize.height)];
     m_textView = tv;
     [tv setVerticallyResizable:YES];
     [tv setHorizontallyResizable:NO];
     [tv setAutoresizingMask:NSViewWidthSizable];
     wxNSTextView* tv = [[wxNSTextView alloc] initWithFrame: NSMakeRect(0, 0,
             contentSize.width, contentSize.height)];
     m_textView = tv;
     [tv setVerticallyResizable:YES];
     [tv setHorizontallyResizable:NO];
     [tv setAutoresizingMask:NSViewWidthSizable];

-    
+

     [m_scrollView setDocumentView: tv];
 
     [tv setDelegate: w];
     [m_scrollView setDocumentView: tv];
 
     [tv setDelegate: w];

-    
-    InstallEventHandler(tv);    
+
+    InstallEventHandler(tv);

 }
 
 wxNSTextViewControl::~wxNSTextViewControl()
 }
 
 wxNSTextViewControl::~wxNSTextViewControl()


@@ -329,9 +329,9 @@ wxNSTextViewControl::~wxNSTextViewControl()
         [m_textView setDelegate: nil];
 }
 
         [m_textView setDelegate: nil];
 }
 

-wxString wxNSTextViewControl::GetStringValue() const 
+wxString wxNSTextViewControl::GetStringValue() const

 {
 {

-    if (m_textView) 
+    if (m_textView)

     {
         wxString result = wxCFStringRef::AsString([m_textView string], m_wxPeer->GetFont().GetEncoding());
         wxMacConvertNewlines13To10( &result ) ;
     {
         wxString result = wxCFStringRef::AsString([m_textView string], m_wxPeer->GetFont().GetEncoding());
         wxMacConvertNewlines13To10( &result ) ;


@@ -339,7 +339,7 @@ wxString wxNSTextViewControl::GetStringValue() const
     }
     return wxEmptyString;
 }
     }
     return wxEmptyString;
 }

-void wxNSTextViewControl::SetStringValue( const wxString &str) 
+void wxNSTextViewControl::SetStringValue( const wxString &str)

 {
     wxString st = str;
     wxMacConvertNewlines10To13( &st );
 {
     wxString st = str;
     wxMacConvertNewlines10To13( &st );


@@ -349,37 +349,37 @@ void wxNSTextViewControl::SetStringValue( const wxString &str)
         [m_textView setString: wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
 }
 
         [m_textView setString: wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
 }
 

-void wxNSTextViewControl::Copy() 
+void wxNSTextViewControl::Copy()

 {
     if (m_textView)
         [m_textView copy:nil];
 
 }
 
 {
     if (m_textView)
         [m_textView copy:nil];
 
 }
 

-void wxNSTextViewControl::Cut() 
+void wxNSTextViewControl::Cut()

 {
     if (m_textView)
         [m_textView cut:nil];
 }
 
 {
     if (m_textView)
         [m_textView cut:nil];
 }
 

-void wxNSTextViewControl::Paste() 
+void wxNSTextViewControl::Paste()

 {
     if (m_textView)
         [m_textView paste:nil];
 }
 
 {
     if (m_textView)
         [m_textView paste:nil];
 }
 

-bool wxNSTextViewControl::CanPaste() const 
-{ 
+bool wxNSTextViewControl::CanPaste() const
+{

     return true;
 }
 
     return true;
 }
 

-void wxNSTextViewControl::SetEditable(bool editable) 
+void wxNSTextViewControl::SetEditable(bool editable)

 {
     if (m_textView)
         [m_textView setEditable: editable];
 }
 
 {
     if (m_textView)
         [m_textView setEditable: editable];
 }
 

-void wxNSTextViewControl::GetSelection( long* from, long* to) const 
+void wxNSTextViewControl::GetSelection( long* from, long* to) const

 {
     if (m_textView)
     {
 {
     if (m_textView)
     {


@@ -411,12 +411,12 @@ void wxNSTextViewControl::SetSelection( long from , long to )
     [m_textView scrollRangeToVisible:selrange];
 }
 
     [m_textView scrollRangeToVisible:selrange];
 }
 

-void wxNSTextViewControl::WriteText(const wxString& str) 
+void wxNSTextViewControl::WriteText(const wxString& str)

 {
     wxString st = str;
     wxMacConvertNewlines10To13( &st );
     wxMacEditHelper helper(m_textView);
 {
     wxString st = str;
     wxMacConvertNewlines10To13( &st );
     wxMacEditHelper helper(m_textView);

-    
+

     [m_textView insertText:wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
 }
 
     [m_textView insertText:wxCFStringRef( st , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
 }
 


@@ -443,18 +443,18 @@ wxNSTextFieldControl::~wxNSTextFieldControl()
         [m_textField setDelegate: nil];
 }
 
         [m_textField setDelegate: nil];
 }
 

-wxString wxNSTextFieldControl::GetStringValue() const 
+wxString wxNSTextFieldControl::GetStringValue() const

 {
     return wxCFStringRef::AsString([m_textField stringValue], m_wxPeer->GetFont().GetEncoding());
 }
 
 {
     return wxCFStringRef::AsString([m_textField stringValue], m_wxPeer->GetFont().GetEncoding());
 }
 

-void wxNSTextFieldControl::SetStringValue( const wxString &str) 
+void wxNSTextFieldControl::SetStringValue( const wxString &str)

 {
     wxMacEditHelper helper(m_textField);
     [m_textField setStringValue: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
 }
 
 {
     wxMacEditHelper helper(m_textField);
     [m_textField setStringValue: wxCFStringRef( str , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
 }
 

-void wxNSTextFieldControl::Copy() 
+void wxNSTextFieldControl::Copy()

 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )
 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )


@@ -463,7 +463,7 @@ void wxNSTextFieldControl::Copy()
     }
 }
 
     }
 }
 

-void wxNSTextFieldControl::Cut() 
+void wxNSTextFieldControl::Cut()

 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )
 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )


@@ -472,7 +472,7 @@ void wxNSTextFieldControl::Cut()
     }
 }
 
     }
 }
 

-void wxNSTextFieldControl::Paste() 
+void wxNSTextFieldControl::Paste()

 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )
 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )


@@ -481,17 +481,17 @@ void wxNSTextFieldControl::Paste()
     }
 }
 
     }
 }
 

-bool wxNSTextFieldControl::CanPaste() const 
-{ 
+bool wxNSTextFieldControl::CanPaste() const
+{

     return true;
 }
 
     return true;
 }
 

-void wxNSTextFieldControl::SetEditable(bool editable) 
+void wxNSTextFieldControl::SetEditable(bool editable)

 {
     [m_textField setEditable:editable];
 }
 
 {
     [m_textField setEditable:editable];
 }
 

-void wxNSTextFieldControl::GetSelection( long* from, long* to) const 
+void wxNSTextFieldControl::GetSelection( long* from, long* to) const

 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )
 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )


@@ -536,7 +536,7 @@ void wxNSTextFieldControl::SetSelection( long from , long to )
     }
 }
 
     }
 }
 

-void wxNSTextFieldControl::WriteText(const wxString& str) 
+void wxNSTextFieldControl::WriteText(const wxString& str)

 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )
 {
     NSText* editor = [m_textField currentEditor];
     if ( editor )


@@ -556,11 +556,11 @@ void wxNSTextFieldControl::WriteText(const wxString& str)
     }
 }
 
     }
 }
 

-void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf), 
+void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf),

     void* WXUNUSED(_cmd), void *WXUNUSED(sender))
 {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     void* WXUNUSED(_cmd), void *WXUNUSED(sender))
 {
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();

-    if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) ) 
+    if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) )

     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
         event.SetEventObject( wxpeer );
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
         event.SetEventObject( wxpeer );


@@ -573,18 +573,18 @@ void wxNSTextFieldControl::controlAction(WXWidget WXUNUSED(slf),
 //
 //
 
 //
 //
 

-wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& str,
                                     const wxString& str,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxWidgetCocoaImpl* c = NULL;
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxWidgetCocoaImpl* c = NULL;

-    
+

     if ( style & wxTE_MULTILINE || style & wxTE_RICH || style & wxTE_RICH2 )
     {
         wxNSTextScrollView* v = nil;
     if ( style & wxTE_MULTILINE || style & wxTE_RICH || style & wxTE_RICH2 )
     {
         wxNSTextScrollView* v = nil;


@@ -592,27 +592,27 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
         c = new wxNSTextViewControl( wxpeer, v );
         static_cast<wxNSTextViewControl*>(c)->SetStringValue(str);
     }
         c = new wxNSTextViewControl( wxpeer, v );
         static_cast<wxNSTextViewControl*>(c)->SetStringValue(str);
     }

-    else 
+    else

     {
         NSTextField* v = nil;
         if ( style & wxTE_PASSWORD )
             v = [[wxNSSecureTextField alloc] initWithFrame:r];
         else
             v = [[wxNSTextField alloc] initWithFrame:r];
     {
         NSTextField* v = nil;
         if ( style & wxTE_PASSWORD )
             v = [[wxNSSecureTextField alloc] initWithFrame:r];
         else
             v = [[wxNSTextField alloc] initWithFrame:r];

-        
+

         if ( style & wxNO_BORDER )
         {
             // FIXME: How can we remove the native control's border?
             // setBordered is separate from the text ctrl's border.
         }
         if ( style & wxNO_BORDER )
         {
             // FIXME: How can we remove the native control's border?
             // setBordered is separate from the text ctrl's border.
         }

-        
+

         [v setBezeled:NO];
         [v setBordered:NO];
         [v setBezeled:NO];
         [v setBordered:NO];

-        
+

         c = new wxNSTextFieldControl( wxpeer, v );
         static_cast<wxNSTextFieldControl*>(c)->SetStringValue(str);
     }
         c = new wxNSTextFieldControl( wxpeer, v );
         static_cast<wxNSTextFieldControl*>(c)->SetStringValue(str);
     }

-    
+

     return c;
 }
 
     return c;
 }
 

diff --git a/src/osx/cocoa/tglbtn.mm b/src/osx/cocoa/tglbtn.mm
index a3002b3d9435f690bd95f44073e372dfd42f2185..8b4fe03b966d92e18549a0168fb73a725614d43f 100644 (file)
--- a/src/osx/cocoa/tglbtn.mm
+++ b/src/osx/cocoa/tglbtn.mm
@@ -25,36 +25,36 @@
 #include "wx/tglbtn.h"
 #include "wx/osx/private.h"
 
 #include "wx/tglbtn.h"
 #include "wx/osx/private.h"
 

-wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];

-    
-    [v setBezelStyle:NSSmallSquareBezelStyle];    
+
+    [v setBezelStyle:NSSmallSquareBezelStyle];

     [v setButtonType:NSOnOffButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
 
     [v setButtonType:NSOnOffButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
 

-wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxBitmap& WXUNUSED(label),
                                     const wxBitmap& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long WXUNUSED(style),

                                     long WXUNUSED(extraStyle))
                                     long WXUNUSED(extraStyle))

-{    
+{

     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];

-    
+

     [v setBezelStyle:NSRegularSquareBezelStyle];
     [v setButtonType:NSOnOffButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     [v setBezelStyle:NSRegularSquareBezelStyle];
     [v setButtonType:NSOnOffButton];
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 70b6de32d04bba0ae7cb1bfa4b6256e92bae7977..3d24514ef0b25430a38770d56c64dfd8e9532b48 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -153,9 +153,9 @@ public:
     bool DoEnable( bool enable );
 
     void UpdateImages();
     bool DoEnable( bool enable );
 
     void UpdateImages();

-    
+

     void UpdateToggleImage( bool toggle );
     void UpdateToggleImage( bool toggle );

-    
+

     void UpdateLabel()
     {
 #if wxOSX_USE_NATIVE_TOOLBAR
     void UpdateLabel()
     {
 #if wxOSX_USE_NATIVE_TOOLBAR


@@ -167,7 +167,7 @@ public:
             wxCFStringRef l(labelStr, GetToolBarFontEncoding());
 
             [m_toolbarItem setLabel:l.AsNSString()];
             wxCFStringRef l(labelStr, GetToolBarFontEncoding());
 
             [m_toolbarItem setLabel:l.AsNSString()];

-            
+

             wxCFStringRef sh( GetShortHelp(), GetToolBarFontEncoding() );
             [m_toolbarItem setToolTip:sh.AsNSString()];
         }
             wxCFStringRef sh( GetShortHelp(), GetToolBarFontEncoding() );
             [m_toolbarItem setToolTip:sh.AsNSString()];
         }


@@ -187,7 +187,7 @@ public:
 
         tbar->OnLeftClick( GetId(), IsToggled() );
     }
 
         tbar->OnLeftClick( GetId(), IsToggled() );
     }

-    
+

 #if wxOSX_USE_NATIVE_TOOLBAR
     void SetToolbarItemRef( NSToolbarItem* ref )
     {
 #if wxOSX_USE_NATIVE_TOOLBAR
     void SetToolbarItemRef( NSToolbarItem* ref )
     {


@@ -274,7 +274,7 @@ private:
 }
 
 - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
 }
 
 - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;

-    
+

 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar;
 
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar;
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar;
 
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar;


@@ -479,7 +479,7 @@ void wxToolBarTool::SetPosition( const wxPoint& position )
             frame.origin.y = mac_y;
             [m_controlHandle setFrame:frame];
         }
             frame.origin.y = mac_y;
             [m_controlHandle setFrame:frame];
         }

-    }    
+    }

 }
 
 void wxToolBarTool::UpdateImages()
 }
 
 void wxToolBarTool::UpdateImages()


@@ -499,7 +499,7 @@ void wxToolBarTool::UpdateImages()
         dc.DrawRectangle( 0, 0, w, h );
         dc.DrawBitmap( m_bmpNormal, 0, 0, true );
         dc.SelectObject( wxNullBitmap );
         dc.DrawRectangle( 0, 0, w, h );
         dc.DrawBitmap( m_bmpNormal, 0, 0, true );
         dc.SelectObject( wxNullBitmap );

-        
+

         [(NSButton*) m_controlHandle setAlternateImage:m_alternateBitmap.GetNSImage()];
     }
     UpdateToggleImage( CanBeToggled() && IsToggled() );
         [(NSButton*) m_controlHandle setAlternateImage:m_alternateBitmap.GetNSImage()];
     }
     UpdateToggleImage( CanBeToggled() && IsToggled() );


@@ -598,19 +598,19 @@ bool wxToolBar::Create(
     if (parent->IsKindOf(CLASSINFO(wxFrame)) && wxSystemOptions::GetOptionInt(wxT("mac.toolbar.no-native")) != 1)
     {
         static wxNSToolbarDelegate* controller = nil;
     if (parent->IsKindOf(CLASSINFO(wxFrame)) && wxSystemOptions::GetOptionInt(wxT("mac.toolbar.no-native")) != 1)
     {
         static wxNSToolbarDelegate* controller = nil;

-        
+

         if ( controller == nil )
             controller = [[wxNSToolbarDelegate alloc] init];
         wxString identifier = wxString::Format( wxT("%p"), this );
         wxCFStringRef cfidentifier(identifier);
         NSToolbar* tb =  [[NSToolbar alloc] initWithIdentifier:cfidentifier.AsNSString()];
         if ( controller == nil )
             controller = [[wxNSToolbarDelegate alloc] init];
         wxString identifier = wxString::Format( wxT("%p"), this );
         wxCFStringRef cfidentifier(identifier);
         NSToolbar* tb =  [[NSToolbar alloc] initWithIdentifier:cfidentifier.AsNSString()];

-        
+

         m_macToolbar = tb ;
         m_macToolbar = tb ;

-        
+

         if (m_macToolbar != NULL)
         {
             [tb setDelegate:controller];
         if (m_macToolbar != NULL)
         {
             [tb setDelegate:controller];

-            
+

             NSToolbarDisplayMode mode = NSToolbarDisplayModeDefault;
             NSToolbarSizeMode displaySize = NSToolbarSizeModeSmall;
 
             NSToolbarDisplayMode mode = NSToolbarDisplayModeDefault;
             NSToolbarSizeMode displaySize = NSToolbarSizeModeSmall;
 


@@ -706,7 +706,7 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
         WXWindow tlw = MacGetTopLevelWindowRef();
         float toolbarHeight = 0.0;
         NSRect windowFrame = NSMakeRect(0, 0, 0, 0);
         WXWindow tlw = MacGetTopLevelWindowRef();
         float toolbarHeight = 0.0;
         NSRect windowFrame = NSMakeRect(0, 0, 0, 0);

- 
+

         if(m_macToolbar && [(NSToolbar*)m_macToolbar isVisible])
         {
             windowFrame = [NSWindow contentRectForFrameRect:[tlw frame]
         if(m_macToolbar && [(NSToolbar*)m_macToolbar isVisible])
         {
             windowFrame = [NSWindow contentRectForFrameRect:[tlw frame]


@@ -714,7 +714,7 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
             toolbarHeight = NSHeight(windowFrame)
                         - NSHeight([[tlw contentView] frame]);
         }
             toolbarHeight = NSHeight(windowFrame)
                         - NSHeight([[tlw contentView] frame]);
         }

- 
+

         if ( width != NULL )
             *width = (int)windowFrame.size.width;
         if ( height != NULL )
         if ( width != NULL )
             *width = (int)windowFrame.size.width;
         if ( height != NULL )


@@ -810,7 +810,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             bResult = true;
             [tlw setToolbar:(NSToolbar*) m_macToolbar];
             [(NSToolbar*) m_macToolbar setVisible:YES];
             bResult = true;
             [tlw setToolbar:(NSToolbar*) m_macToolbar];
             [(NSToolbar*) m_macToolbar setVisible:YES];

-            
+

             m_peer->Move(0,0,0,0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             m_peer->SetVisibility( false );
             m_peer->Move(0,0,0,0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             m_peer->SetVisibility( false );


@@ -1236,9 +1236,9 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 [v setBordered:NO];
                 [v setButtonType: ( tool->CanBeToggled() ? NSOnOffButton : NSMomentaryPushInButton )];
                 [v setImplementation:tool];
                 [v setBordered:NO];
                 [v setButtonType: ( tool->CanBeToggled() ? NSOnOffButton : NSMomentaryPushInButton )];
                 [v setImplementation:tool];

-                
+

                 controlHandle = v;
                 controlHandle = v;

-                
+

 #if wxOSX_USE_NATIVE_TOOLBAR
                 if (m_macToolbar != NULL)
                 {
 #if wxOSX_USE_NATIVE_TOOLBAR
                 if (m_macToolbar != NULL)
                 {

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 194abcd750cd6dca6373ceaf514644622d98eb61..4b22268b3ff215ba75faa8d8548b48e7d0e6a0cf 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -52,7 +52,7 @@ void wxBell()
 
 void wxMacWakeUp()
 {
 
 void wxMacWakeUp()
 {

-       NSEvent* wakeupEvent = [NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint 
+       NSEvent* wakeupEvent = [NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint

                                                                                 modifierFlags:NSAnyEventMask timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0];
        [NSApp postEvent:wakeupEvent atStart:NO];
 }
                                                                                 modifierFlags:NSAnyEventMask timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0];
        [NSApp postEvent:wakeupEvent atStart:NO];
 }


@@ -148,9 +148,9 @@ void wxMacWakeUp()
 }
 @end
 
 }
 @end
 

-/* 
+/*

     allows ShowModal to work when using sheets.
     allows ShowModal to work when using sheets.

-    see include/wx/osx/cocoa/private.h for more info 
+    see include/wx/osx/cocoa/private.h for more info

 */
 @implementation ModalDialogDelegate
 - (id)init
 */
 @implementation ModalDialogDelegate
 - (id)init


@@ -161,7 +161,7 @@ void wxMacWakeUp()
     return self;
 }
 
     return self;
 }
 

-- (BOOL)finished 
+- (BOOL)finished

 {
     return sheetFinished;
 }
 {
     return sheetFinished;
 }


@@ -300,7 +300,7 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
     NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
     [view unlockFocus];
     // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
     NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
     [view unlockFocus];

-    
+

     wxBitmap bitmap(width, height);
     if ( [rep respondsToSelector:@selector(CGImage)] )
     {
     wxBitmap bitmap(width, height);
     if ( [rep respondsToSelector:@selector(CGImage)] )
     {

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index f645830968ac79d4e01aebaeb62013218a8c0b4d..fed5b07659fc780a6786835a482d8013a7756440 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -82,12 +82,12 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
     NSTrackingRectTag rectTag;
 }
 
     NSTrackingRectTag rectTag;
 }
 

-// the tracking tag is needed to track mouse enter / exit events 
+// the tracking tag is needed to track mouse enter / exit events

 - (void) setTrackingTag: (NSTrackingRectTag)tag;
 - (NSTrackingRectTag) trackingTag;
 @end // wxNSView
 
 - (void) setTrackingTag: (NSTrackingRectTag)tag;
 - (NSTrackingRectTag) trackingTag;
 @end // wxNSView
 

-@interface NSView(PossibleMethods) 
+@interface NSView(PossibleMethods)

 - (void)setTitle:(NSString *)aString;
 - (void)setStringValue:(NSString *)aString;
 - (void)setIntValue:(int)anInt;
 - (void)setTitle:(NSString *)aString;
 - (void)setStringValue:(NSString *)aString;
 - (void)setIntValue:(int)anInt;


@@ -114,14 +114,14 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 - (void)setTarget:(id)anObject;
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;
 - (void)setTarget:(id)anObject;
 - (void)setAction:(SEL)aSelector;
 - (void)setDoubleAction:(SEL)aSelector;

-@end 
+@end

 
 long wxOSXTranslateCocoaKey( NSEvent* event )
 {
     long retval = 0;
 
     if ([event type] != NSFlagsChanged)
 
 long wxOSXTranslateCocoaKey( NSEvent* event )
 {
     long retval = 0;
 
     if ([event type] != NSFlagsChanged)

-    {    
+    {

         NSString* s = [event charactersIgnoringModifiers];
         // backspace char reports as delete w/modifiers for some reason
         if ([s length] == 1)
         NSString* s = [event charactersIgnoringModifiers];
         // backspace char reports as delete w/modifiers for some reason
         if ([s length] == 1)


@@ -130,7 +130,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event )
             {
                 // backspace key
                 case 0x7F :
             {
                 // backspace key
                 case 0x7F :

-                case 8 : 
+                case 8 :

                     retval = WXK_BACK;
                     break;
                 case NSUpArrowFunctionKey :
                     retval = WXK_BACK;
                     break;
                 case NSUpArrowFunctionKey :


@@ -177,7 +177,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event )
             }
         }
     }
             }
         }
     }

-    
+

     // Some keys don't seem to have constants. The code mimics the approach
     // taken by WebKit. See:
     // http://trac.webkit.org/browser/trunk/WebCore/platform/mac/KeyEventMac.mm
     // Some keys don't seem to have constants. The code mimics the approach
     // taken by WebKit. See:
     // http://trac.webkit.org/browser/trunk/WebCore/platform/mac/KeyEventMac.mm


@@ -208,17 +208,17 @@ long wxOSXTranslateCocoaKey( NSEvent* event )
             retval = WXK_CONTROL;
             break;
         // clear key
             retval = WXK_CONTROL;
             break;
         // clear key

-        case 71: 
+        case 71:

             retval = WXK_CLEAR;
             break;
         // tab key
             retval = WXK_CLEAR;
             break;
         // tab key

-        case 48: 
+        case 48:

             retval = WXK_TAB;
             break;
 
         case 75: // /
             retval = WXK_NUMPAD_DIVIDE;
             retval = WXK_TAB;
             break;
 
         case 75: // /
             retval = WXK_NUMPAD_DIVIDE;

-            break;            
+            break;

         case 67: // *
             retval = WXK_NUMPAD_MULTIPLY;
             break;
         case 67: // *
             retval = WXK_NUMPAD_MULTIPLY;
             break;


@@ -280,10 +280,10 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;
     wxevent.m_controlDown = modifiers & NSControlKeyMask;
     wxevent.m_altDown = modifiers & NSAlternateKeyMask;
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;

-    
+

     wxevent.m_rawCode = [nsEvent keyCode];
     wxevent.m_rawFlags = modifiers;
     wxevent.m_rawCode = [nsEvent keyCode];
     wxevent.m_rawFlags = modifiers;

-    
+

     wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;
 
     wxString chars;
     wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;
 
     wxString chars;


@@ -301,10 +301,10 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin
             chars = wxCFStringRef::AsString(nschars);
         }
     }
             chars = wxCFStringRef::AsString(nschars);
         }
     }

-    
+

     int aunichar = chars.Length() > 0 ? chars[0] : 0;
     long keyval = 0;
     int aunichar = chars.Length() > 0 ? chars[0] : 0;
     long keyval = 0;

-    
+

     if (wxevent.GetEventType() != wxEVT_CHAR)
     {
         keyval = wxOSXTranslateCocoaKey(nsEvent) ;
     if (wxevent.GetEventType() != wxEVT_CHAR)
     {
         keyval = wxOSXTranslateCocoaKey(nsEvent) ;


@@ -345,7 +345,7 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin
         else
             keyval = aunichar;
     }
         else
             keyval = aunichar;
     }

-    
+

 #if wxUSE_UNICODE
     wxevent.m_uniChar = aunichar;
 #endif
 #if wxUSE_UNICODE
     wxevent.m_uniChar = aunichar;
 #endif


@@ -373,7 +373,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;
     wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;
 
     wxevent.m_metaDown = modifiers & NSCommandKeyMask;
     wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;
 

-    UInt32 mouseChord = 0; 
+    UInt32 mouseChord = 0;

 
     switch (eventType)
     {
 
     switch (eventType)
     {


@@ -519,9 +519,9 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
         default :
             break ;
     }
         default :
             break ;
     }

-    
+

     wxevent.m_clickCount = clickCount;
     wxevent.m_clickCount = clickCount;

-    
+

 }
 
 @implementation wxNSView
 }
 
 @implementation wxNSView


@@ -529,7 +529,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXCocoaClassAddWXMethods( self );


@@ -562,7 +562,7 @@ NSDragOperation wxOSX_draggingEntered( id self, SEL _cmd, id <NSDraggingInfo>sen
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;

-        
+

     return impl->draggingEntered(sender, self, _cmd);
 }
 
     return impl->draggingEntered(sender, self, _cmd);
 }
 


@@ -571,7 +571,7 @@ void wxOSX_draggingExited( id self, SEL _cmd, id <NSDraggingInfo> sender )
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return ;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return ;

-        
+

     return impl->draggingExited(sender, self, _cmd);
 }
 
     return impl->draggingExited(sender, self, _cmd);
 }
 


@@ -580,7 +580,7 @@ NSDragOperation wxOSX_draggingUpdated( id self, SEL _cmd, id <NSDraggingInfo>sen
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;

-        
+

     return impl->draggingUpdated(sender, self, _cmd);
 }
 
     return impl->draggingUpdated(sender, self, _cmd);
 }
 


@@ -589,45 +589,45 @@ BOOL wxOSX_performDragOperation( id self, SEL _cmd, id <NSDraggingInfo> sender )
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NSDragOperationNone;

-        
+

     return impl->performDragOperation(sender, self, _cmd) ? YES:NO ;
 }
 
 #endif
 
     return impl->performDragOperation(sender, self, _cmd) ? YES:NO ;
 }
 
 #endif
 

-void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) 
+void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->mouseEvent(event, self, _cmd);
 }
 
     impl->mouseEvent(event, self, _cmd);
 }
 

-void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event) 
+void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->keyEvent(event, self, _cmd);
 }
 
     impl->keyEvent(event, self, _cmd);
 }
 

-void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) 
+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->insertText(text, self, _cmd);
 }
 
     impl->insertText(text, self, _cmd);
 }
 

-BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) 
+BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event)

 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->performKeyEquivalent(event, self, _cmd);
 }
 
     return impl->performKeyEquivalent(event, self, _cmd);
 }
 


@@ -636,7 +636,7 @@ BOOL wxOSX_acceptsFirstResponder(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->acceptsFirstResponder(self, _cmd);
 }
 
     return impl->acceptsFirstResponder(self, _cmd);
 }
 


@@ -645,7 +645,7 @@ BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->becomeFirstResponder(self, _cmd);
 }
 
     return impl->becomeFirstResponder(self, _cmd);
 }
 


@@ -654,7 +654,7 @@ BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->resignFirstResponder(self, _cmd);
 }
 
     return impl->resignFirstResponder(self, _cmd);
 }
 


@@ -663,7 +663,7 @@ void wxOSX_resetCursorRects(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->resetCursorRects(self, _cmd);
 }
 
     impl->resetCursorRects(self, _cmd);
 }
 


@@ -672,7 +672,7 @@ BOOL wxOSX_isFlipped(NSView* self, SEL _cmd)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->isFlipped(self, _cmd) ? YES:NO;
 }
 
     return impl->isFlipped(self, _cmd) ? YES:NO;
 }
 


@@ -681,7 +681,7 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     return impl->drawRect(&rect, self, _cmd);
 }
 
     return impl->drawRect(&rect, self, _cmd);
 }
 


@@ -690,7 +690,7 @@ void wxOSX_controlAction(NSView* self, SEL _cmd, id sender)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->controlAction(self, _cmd, sender);
 }
 
     impl->controlAction(self, _cmd, sender);
 }
 


@@ -699,7 +699,7 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender)
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->controlDoubleAction(self, _cmd, sender);
 }
 
     impl->controlDoubleAction(self, _cmd, sender);
 }
 


@@ -708,11 +708,11 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf),
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];

-    
+

     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;
     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;

-        
+

     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;
     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;


@@ -728,12 +728,12 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf),
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 

-    PasteboardRef pboardRef;    
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnEnter(pt.x, pt.y, result);
     CFRelease(pboardRef);
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnEnter(pt.x, pt.y, result);
     CFRelease(pboardRef);

-     
+

     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {
     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {


@@ -753,16 +753,16 @@ void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget WXUNUSED(slf), void *WX
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
 {
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];

-    
+

     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return;
     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return;

-        
+

     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return;
     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return;

-        
-    PasteboardRef pboardRef;    
+
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     target->OnLeave();
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     target->OnLeave();


@@ -774,11 +774,11 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf),
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
     id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];

-        
+

     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;
     wxWindow* wxpeer = GetWXPeer();
     if ( wxpeer == NULL )
         return NSDragOperationNone;

-        
+

     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;
     wxDropTarget* target = wxpeer->GetDropTarget();
     if ( target == NULL )
         return NSDragOperationNone;


@@ -794,12 +794,12 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf),
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 

-    PasteboardRef pboardRef;    
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnDragOver(pt.x, pt.y, result);
     CFRelease(pboardRef);
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
     result = target->OnDragOver(pt.x, pt.y, result);
     CFRelease(pboardRef);

-     
+

     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {
     NSDragOperation nsresult = NSDragOperationNone;
     switch (result )
     {


@@ -821,7 +821,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo
 
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
 
     NSPasteboard *pboard = [sender draggingPasteboard];
     NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];

-    
+

     wxWindow* wxpeer = GetWXPeer();
     wxDropTarget* target = wxpeer->GetDropTarget();
     wxDragResult result = wxDragNone;
     wxWindow* wxpeer = GetWXPeer();
     wxDropTarget* target = wxpeer->GetDropTarget();
     wxDragResult result = wxDragNone;


@@ -835,7 +835,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 
     else if ( sourceDragMask & NSDragOperationMove )
         result = wxDragMove;
 

-    PasteboardRef pboardRef;    
+    PasteboardRef pboardRef;

     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
 
     PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
     target->SetCurrentDragPasteboard(pboardRef);
 


@@ -843,7 +843,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo
         result = target->OnData(pt.x, pt.y, result);
 
     CFRelease(pboardRef);
         result = target->OnData(pt.x, pt.y, result);
 
     CFRelease(pboardRef);

-     
+

     return result != wxDragNone;
 }
 
     return result != wxDragNone;
 }
 


@@ -908,7 +908,7 @@ bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder

-    NSView* otherView = FindFocus(); 
+    NSView* otherView = FindFocus();

 
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
 
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);


@@ -927,7 +927,7 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
     // get the current focus after running resignFirstResponder
     // note that this value isn't reliable, it might return the same view that
     // is resigning
     // get the current focus after running resignFirstResponder
     // note that this value isn't reliable, it might return the same view that
     // is resigning

-    NSView* otherView = FindFocus(); 
+    NSView* otherView = FindFocus();

     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     // NSTextViews have an editor as true responder, therefore the might get the
     // resign notification if their editor takes over, don't trigger any event then
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     // NSTextViews have an editor as true responder, therefore the might get the
     // resign notification if their editor takes over, don't trigger any event then


@@ -956,7 +956,7 @@ void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd)
         }
     }
 }
         }
     }
 }

-  
+

 bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))
 {
     return m_isFlipped;
 bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))
 {
     return m_isFlipped;


@@ -969,7 +969,7 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
 {
     CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextSaveGState( context );
 {
     CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
     CGContextSaveGState( context );

-    
+

 #if OSX_DEBUG_DRAWING
     CGContextBeginPath( context );
     CGContextMoveToPoint(context, 0, 0);
 #if OSX_DEBUG_DRAWING
     CGContextBeginPath( context );
     CGContextMoveToPoint(context, 0, 0);


@@ -990,7 +990,7 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
     }
         CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
         CGContextScaleCTM( context, 1, -1 );
     }

-    
+

     wxRegion updateRgn;
     const NSRect *rects;
     NSInteger count;
     wxRegion updateRgn;
     const NSRect *rects;
     NSInteger count;


@@ -1004,9 +1004,9 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );

-    
+

     bool handled = wxpeer->MacDoRedraw( 0 );
     bool handled = wxpeer->MacDoRedraw( 0 );

-            
+

     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );
     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );


@@ -1035,7 +1035,7 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU
 {
 }
 
 {
 }
 

-// 
+//

 
 #if OBJC_API_VERSION >= 2
 
 
 #if OBJC_API_VERSION >= 2
 


@@ -1074,11 +1074,11 @@ void wxOSXCocoaClassAddWXMethods(Class c)
     wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" )

-    
+

     wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(keyUp:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(flagsChanged:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(keyUp:), (IMP) wxOSX_keyEvent, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(flagsChanged:), (IMP) wxOSX_keyEvent, "v@:@" )

-    
+

     wxOSX_CLASS_ADD_METHOD(c, @selector(insertText:), (IMP) wxOSX_insertText, "v@:@" )
 
     wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "c@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(insertText:), (IMP) wxOSX_insertText, "v@:@" )
 
     wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "c@:@" )


@@ -1099,8 +1099,8 @@ void wxOSXCocoaClassAddWXMethods(Class c)
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingUpdated:), (IMP) wxOSX_draggingUpdated, "I@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingExited:), (IMP) wxOSX_draggingExited, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(performDragOperation:), (IMP) wxOSX_performDragOperation, "c@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingUpdated:), (IMP) wxOSX_draggingUpdated, "I@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(draggingExited:), (IMP) wxOSX_draggingExited, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(performDragOperation:), (IMP) wxOSX_performDragOperation, "c@:@" )

-#endif     
-        
+#endif
+

 #if OBJC_API_VERSION < 2
     } ;
     static int method_count = WXSIZEOF( wxmethods );
 #if OBJC_API_VERSION < 2
     } ;
     static int method_count = WXSIZEOF( wxmethods );


@@ -1133,7 +1133,7 @@ wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRoo
     [m_osxView release];
 }
 
     [m_osxView release];
 }
 

-wxWidgetCocoaImpl::wxWidgetCocoaImpl() 
+wxWidgetCocoaImpl::wxWidgetCocoaImpl()

 {
     Init();
 }
 {
     Init();
 }


@@ -1160,8 +1160,8 @@ wxWidgetCocoaImpl::~wxWidgetCocoaImpl()
     if ( m_osxView )
         CFRelease(m_osxView);
 }
     if ( m_osxView )
         CFRelease(m_osxView);
 }

-    
-bool wxWidgetCocoaImpl::IsVisible() const 
+
+bool wxWidgetCocoaImpl::IsVisible() const

 {
     return [m_osxView isHiddenOrHasHiddenAncestor] == NO;
 }
 {
     return [m_osxView isHiddenOrHasHiddenAncestor] == NO;
 }


@@ -1175,7 +1175,7 @@ void wxWidgetCocoaImpl::Raise()
 {
     // Not implemented
 }
 {
     // Not implemented
 }

-    
+

 void wxWidgetCocoaImpl::Lower()
 {
     // Not implemented
 void wxWidgetCocoaImpl::Lower()
 {
     // Not implemented


@@ -1200,7 +1200,7 @@ void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(d
 void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
 {
     wxWindowMac* parent = GetWXPeer()->GetParent();
 void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
 {
     wxWindowMac* parent = GetWXPeer()->GetParent();

-    // under Cocoa we might have a contentView in the wxParent to which we have to 
+    // under Cocoa we might have a contentView in the wxParent to which we have to

     // adjust the coordinates
     if (parent && [m_osxView superview] != parent->GetHandle() )
     {
     // adjust the coordinates
     if (parent && [m_osxView superview] != parent->GetHandle() )
     {


@@ -1215,13 +1215,13 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
     [[m_osxView superview] setNeedsDisplayInRect:[m_osxView frame]];
     NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) );
     [m_osxView setFrame:r];
     [[m_osxView superview] setNeedsDisplayInRect:[m_osxView frame]];
     NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) );
     [m_osxView setFrame:r];

-    [[m_osxView superview] setNeedsDisplayInRect:r]; 
-    
+    [[m_osxView superview] setNeedsDisplayInRect:r];
+

     if ([m_osxView respondsToSelector:@selector(trackingTag)] )
     {
         if ( [(wxNSView*)m_osxView trackingTag] )
             [m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]];
     if ([m_osxView respondsToSelector:@selector(trackingTag)] )
     {
         if ( [(wxNSView*)m_osxView trackingTag] )
             [m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]];

-        
+

         [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]];
     }
 }
         [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]];
     }
 }


@@ -1245,10 +1245,10 @@ void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &hei
     if ( [m_osxView respondsToSelector:@selector(contentView) ] )
     {
         NSView* cv = [m_osxView contentView];
     if ( [m_osxView respondsToSelector:@selector(contentView) ] )
     {
         NSView* cv = [m_osxView contentView];

-     
+

         NSRect bounds = [m_osxView bounds];
         NSRect rect = [cv frame];
         NSRect bounds = [m_osxView bounds];
         NSRect rect = [cv frame];

-        
+

         int y = (int)rect.origin.y;
         int x = (int)rect.origin.x;
         if ( ![ m_osxView isFlipped ] )
         int y = (int)rect.origin.y;
         int x = (int)rect.origin.x;
         if ( ![ m_osxView isFlipped ] )


@@ -1288,11 +1288,11 @@ bool wxWidgetCocoaImpl::HasFocus() const
     return ( FindFocus() == m_osxView );
 }
 
     return ( FindFocus() == m_osxView );
 }
 

-bool wxWidgetCocoaImpl::SetFocus() 
+bool wxWidgetCocoaImpl::SetFocus()

 {
     if ( [m_osxView canBecomeKeyView] == NO )
         return false;
 {
     if ( [m_osxView canBecomeKeyView] == NO )
         return false;

-        
+

     [[m_osxView window] makeFirstResponder: m_osxView] ;
     [[m_osxView window] makeKeyAndOrderFront:nil] ;
     return true;
     [[m_osxView window] makeFirstResponder: m_osxView] ;
     [[m_osxView window] makeKeyAndOrderFront:nil] ;
     return true;


@@ -1329,21 +1329,21 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding
         [m_osxView setStringValue:cf.AsNSString()];
     }
 }
         [m_osxView setStringValue:cf.AsNSString()];
     }
 }

-    
+

 
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     NSPoint p = wxToNSPoint( from->GetWXWidget(), *pt );
 
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     NSPoint p = wxToNSPoint( from->GetWXWidget(), *pt );

-    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; 
+    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ];

     *pt = wxFromNSPoint( to->GetWXWidget(), p );
 }
 
     *pt = wxFromNSPoint( to->GetWXWidget(), p );
 }
 

-wxInt32 wxWidgetCocoaImpl::GetValue() const 
+wxInt32 wxWidgetCocoaImpl::GetValue() const

 {
     return [(NSControl*)m_osxView intValue];
 }
 
 {
     return [(NSControl*)m_osxView intValue];
 }
 

-void wxWidgetCocoaImpl::SetValue( wxInt32 v ) 
+void wxWidgetCocoaImpl::SetValue( wxInt32 v )

 {
     if (  [m_osxView respondsToSelector:@selector(setIntValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(setIntValue:)] )
     {


@@ -1359,7 +1359,7 @@ void wxWidgetCocoaImpl::SetValue( wxInt32 v )
     }
 }
 
     }
 }
 

-void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) 
+void wxWidgetCocoaImpl::SetMinimum( wxInt32 v )

 {
     if (  [m_osxView respondsToSelector:@selector(setMinValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(setMinValue:)] )
     {


@@ -1367,7 +1367,7 @@ void wxWidgetCocoaImpl::SetMinimum( wxInt32 v )
     }
 }
 
     }
 }
 

-void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) 
+void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )

 {
     if (  [m_osxView respondsToSelector:@selector(setMaxValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(setMaxValue:)] )
     {


@@ -1375,7 +1375,7 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )
     }
 }
 
     }
 }
 

-wxInt32 wxWidgetCocoaImpl::GetMinimum() const 
+wxInt32 wxWidgetCocoaImpl::GetMinimum() const

 {
     if (  [m_osxView respondsToSelector:@selector(getMinValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(getMinValue:)] )
     {


@@ -1384,7 +1384,7 @@ wxInt32 wxWidgetCocoaImpl::GetMinimum() const
     return 0;
 }
 
     return 0;
 }
 

-wxInt32 wxWidgetCocoaImpl::GetMaximum() const 
+wxInt32 wxWidgetCocoaImpl::GetMaximum() const

 {
     if (  [m_osxView respondsToSelector:@selector(getMaxValue:)] )
     {
 {
     if (  [m_osxView respondsToSelector:@selector(getMaxValue:)] )
     {


@@ -1487,10 +1487,10 @@ void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 WXUNUSED(val), wxInt32 WXUNUSED(
 {
 }
 
 {
 }
 

-void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) 
+void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )

 {
     NSControlSize size = NSRegularControlSize;
 {
     NSControlSize size = NSRegularControlSize;

-    
+

     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :


@@ -1515,12 +1515,12 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
     }
     if ( [m_osxView respondsToSelector:@selector(setControlSize:)] )
         [m_osxView setControlSize:size];
     }
     if ( [m_osxView respondsToSelector:@selector(setControlSize:)] )
         [m_osxView setControlSize:size];

-    else if ([m_osxView respondsToSelector:@selector(cell)]) 
-       { 
-               id cell = [(id)m_osxView cell]; 
-               if ([cell respondsToSelector:@selector(setControlSize:)]) 
-                       [cell setControlSize:size]; 
-       } 
+    else if ([m_osxView respondsToSelector:@selector(cell)])
+    {
+        id cell = [(id)m_osxView cell];
+        if ([cell respondsToSelector:@selector(setControlSize:)])
+            [cell setControlSize:size];
+    }

 }
 
 void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)
 }
 
 void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)


@@ -1541,7 +1541,7 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
         {
             [c setDoubleAction: @selector(controlDoubleAction:)];
         }
         {
             [c setDoubleAction: @selector(controlDoubleAction:)];
         }

-        
+

     }
 }
 
     }
 }
 


@@ -1549,7 +1549,7 @@ bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
 {
     wxKeyEvent wxevent(wxEVT_CHAR);
     SetupKeyEvent( wxevent, event, text );
 {
     wxKeyEvent wxevent(wxEVT_CHAR);
     SetupKeyEvent( wxevent, event, text );

-    wxevent.SetEventObject(GetWXPeer());  
+    wxevent.SetEventObject(GetWXPeer());

 
     return GetWXPeer()->OSXHandleKeyEvent(wxevent);
 }
 
     return GetWXPeer()->OSXHandleKeyEvent(wxevent);
 }


@@ -1558,7 +1558,7 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );

-    wxevent.SetEventObject(GetWXPeer());    
+    wxevent.SetEventObject(GetWXPeer());

     bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
 
     // this will fire higher level events, like insertText, to help
     bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
 
     // this will fire higher level events, like insertText, to help


@@ -1580,8 +1580,8 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {
 
 bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
 {

-    NSPoint clickLocation; 
-    clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil]; 
+    NSPoint clickLocation;
+    clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil];

     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent( wxevent , event ) ;
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent( wxevent , event ) ;


@@ -1625,7 +1625,7 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* oth
 #endif
 
         wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));
 #endif
 
         wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));

-                    
+

         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
         if (otherWindow)
         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
         if (otherWindow)


@@ -1666,7 +1666,7 @@ void wxWidgetCocoaImpl::SetFlipped(bool flipped)
 // Factory methods
 //
 
 // Factory methods
 //
 

-wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), 
+wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent),

     wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
     long WXUNUSED(style), long WXUNUSED(extraStyle))
 {
     wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
     long WXUNUSED(style), long WXUNUSED(extraStyle))
 {


@@ -1676,12 +1676,12 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WX
     // temporary hook for dnd
     [v registerForDraggedTypes:[NSArray arrayWithObjects:
         NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
     // temporary hook for dnd
     [v registerForDraggedTypes:[NSArray arrayWithObjects:
         NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];

-        
+

     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
 
     wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
     return c;
 }
 

-wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) 
+wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )

 {
     NSWindow* tlw = now->GetWXWindow();
     wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];
 {
     NSWindow* tlw = now->GetWXWindow();
     wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];

diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index a2f766043501e896312bd65b3bcf33e7c2852d10..157cb84b510f760069c54f8fd2db99afee89d7a8 100644 (file)
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -1171,7 +1171,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
     int height = image.GetHeight();
 
     wxBitmapRefData* bitmapRefData;
     int height = image.GetHeight();
 
     wxBitmapRefData* bitmapRefData;

-    
+

     m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
 
     if ( bitmapRefData->IsOk())
     m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
 
     if ( bitmapRefData->IsOk())


@@ -1654,7 +1654,7 @@ WXHBITMAP wxMask::GetHBITMAP() const
 // Standard Handlers
 // ----------------------------------------------------------------------------
 
 // Standard Handlers
 // ----------------------------------------------------------------------------
 

-#if !defined( __LP64__ ) && !defined(__WXOSX_IPHONE__) 
+#if !defined( __LP64__ ) && !defined(__WXOSX_IPHONE__)

 
 class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 {
 
 class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 {

diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index b603e5b48d5ae63b0672834b60233f80fab846c2..46a9c0c8af28b9cf976a3ea33d091aa37d64aa3c 100644 (file)
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -641,7 +641,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
     char* buf = NULL ;
 
     CFStringEncoding cfencoding = 0;
     char* buf = NULL ;
 
     CFStringEncoding cfencoding = 0;

-    wxString result;    
+    wxString result;

 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     cfencoding = kCFStringEncodingUTF32Native;
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     cfencoding = kCFStringEncodingUTF32Native;


@@ -660,7 +660,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
     buf = new char[ cStrLen ] ;
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
     buf = new char[ cStrLen ] ;
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;

-    
+

 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     result = wxString( (const wchar_t*) buf , cStrLen/4);
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     result = wxString( (const wchar_t*) buf , cStrLen/4);


@@ -672,7 +672,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
 #else
     result = wxString(buf, cStrLen) ;
 #endif
 #else
     result = wxString(buf, cStrLen) ;
 #endif

-    
+

     delete[] buf ;
     wxMacConvertNewlines10To13( &result);
     return result ;
     delete[] buf ;
     wxMacConvertNewlines10To13( &result);
     return result ;


@@ -684,7 +684,7 @@ wxString wxCFStringRef::AsString(wxFontEncoding encoding) const
 }
 
 #if wxOSX_USE_COCOA_OR_IPHONE
 }
 
 #if wxOSX_USE_COCOA_OR_IPHONE

-wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding ) 
+wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )

 {
     return AsString( (CFStringRef) ref, encoding );
 }
 {
     return AsString( (CFStringRef) ref, encoding );
 }


@@ -731,11 +731,11 @@ wxMacUniCharBuffer::~wxMacUniCharBuffer()
     free( m_ubuf ) ;
 }
 
     free( m_ubuf ) ;
 }
 

-UniCharPtr wxMacUniCharBuffer::GetBuffer() 
+UniCharPtr wxMacUniCharBuffer::GetBuffer()

 {
     return m_ubuf ;
 }
 {
     return m_ubuf ;
 }

-   
+

 UniCharCount wxMacUniCharBuffer::GetChars()
 {
     return m_chars ;
 UniCharCount wxMacUniCharBuffer::GetChars()
 {
     return m_chars ;

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index d8746577b0e2518a51a07b03c813e1cd6dabddb5..81913797624c071b1634b4a39d94128f09cd7f1f 100644 (file)
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -78,7 +78,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     else
 #endif
     {
     else
 #endif
     {

-        CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ;    
+        CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ;

         col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
     }
     m_cgColour.reset( col );
         col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
     }
     m_cgColour.reset( col );


@@ -94,13 +94,13 @@ void wxColour::InitRGBColor( const RGBColor& col )
     CGColorRef cfcol;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     if ( CGColorCreateGenericRGB != NULL )
     CGColorRef cfcol;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     if ( CGColorCreateGenericRGB != NULL )

-        cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),  
+        cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),

                                         (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
     else
 #endif
     {
                                         (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
     else
 #endif
     {

-        CGFloat components[4] = {   (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),  
-                                    (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;    
+        CGFloat components[4] = {   (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
+                                    (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;

         cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
     }
     m_cgColour.reset( cfcol );
         cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
     }
     m_cgColour.reset( cfcol );

diff --git a/src/osx/core/dcmemory.cpp b/src/osx/core/dcmemory.cpp
index a21782eaaebcc43bf21e9f5a89d0c64de19f3d01..1debcb3c0e639ce479612b73edcf3cbfeccd3797 100644 (file)
--- a/src/osx/core/dcmemory.cpp
+++ b/src/osx/core/dcmemory.cpp
@@ -78,8 +78,8 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
         if ( m_selected.GetDepth() != 1 )
             m_selected.UseAlpha() ;
         m_selected.BeginRawAccess() ;
         if ( m_selected.GetDepth() != 1 )
             m_selected.UseAlpha() ;
         m_selected.BeginRawAccess() ;

-               m_width = bitmap.GetWidth();
-               m_height = bitmap.GetHeight();
+        m_width = bitmap.GetWidth();
+        m_height = bitmap.GetHeight();

         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
         CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
 
         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
         CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
 


@@ -87,7 +87,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
         {
             CGContextSetFillColorSpace( bmCtx, genericColorSpace );
             CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );
         {
             CGContextSetFillColorSpace( bmCtx, genericColorSpace );
             CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );

-                       SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );
+            SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );

         }
         m_ok = (m_graphicContext != NULL) ;
     }
         }
         m_ok = (m_graphicContext != NULL) ;
     }

diff --git a/src/osx/core/glgrab.cpp b/src/osx/core/glgrab.cpp
index a3ab6634751f2d8543ace3b5ba012688ac55379f..ccb2ff76ad51cc6b99e182d2a8fe64fe01fa8d0b 100644 (file)
--- a/src/osx/core/glgrab.cpp
+++ b/src/osx/core/glgrab.cpp
@@ -3,7 +3,7 @@
  consideration of your agreement to the following terms, and your use, installation or modification
  of this Apple software constitutes acceptance of these terms. If you do not agree with these terms,
  please do not use, install or modify this Apple software.
  consideration of your agreement to the following terms, and your use, installation or modification
  of this Apple software constitutes acceptance of these terms. If you do not agree with these terms,
  please do not use, install or modify this Apple software.

- 
+

  In consideration of your agreement to abide by the following terms, and subject to these
  terms, Apple grants you a personal, non-exclusive license, under Apple\xd5s copyrights in
  this original Apple software (the "Apple Software"), to use and modify the Apple Software,
  In consideration of your agreement to abide by the following terms, and subject to these
  terms, Apple grants you a personal, non-exclusive license, under Apple\xd5s copyrights in
  this original Apple software (the "Apple Software"), to use and modify the Apple Software,


@@ -16,12 +16,12 @@
  licenses, express or implied, are granted by Apple herein, including but not limited
  to any patent rights that may be infringed by your derivative works or by other works
  in which the Apple Software may be incorporated.
  licenses, express or implied, are granted by Apple herein, including but not limited
  to any patent rights that may be infringed by your derivative works or by other works
  in which the Apple Software may be incorporated.

- 
+

  The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES,
  EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT,
  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS
  USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
  The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES,
  EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT,
  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS
  USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.

- 
+

  IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL
  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
           OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
  IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL
  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
           OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,


@@ -54,20 +54,20 @@ static void swizzleBitmap(void * data, int rowBytes, int height)
     void * topP;
     void * bottomP;
     void * base;
     void * topP;
     void * bottomP;
     void * base;

-    
-    
+
+

     top = 0;
     bottom = height - 1;
     base = data;
     buffer = malloc(rowBytes);
     top = 0;
     bottom = height - 1;
     base = data;
     buffer = malloc(rowBytes);

-    
-    
+
+

     while ( top < bottom )
     {
         topP = (void *)((top * rowBytes) + (intptr_t)base);
         bottomP = (void *)((bottom * rowBytes) + (intptr_t)base);
     while ( top < bottom )
     {
         topP = (void *)((top * rowBytes) + (intptr_t)base);
         bottomP = (void *)((bottom * rowBytes) + (intptr_t)base);

-        
-        
+
+

         /*
          * Save and swap scanlines.
          *
         /*
          * Save and swap scanlines.
          *


@@ -78,7 +78,7 @@ static void swizzleBitmap(void * data, int rowBytes, int height)
         bcopy( topP, buffer, rowBytes );
         bcopy( bottomP, topP, rowBytes );
         bcopy( buffer, bottomP, rowBytes );
         bcopy( topP, buffer, rowBytes );
         bcopy( bottomP, topP, rowBytes );
         bcopy( buffer, bottomP, rowBytes );

-        
+

         ++top;
         --bottom;
     }
         ++top;
         --bottom;
     }


@@ -102,7 +102,7 @@ static void swizzleBitmap(void * data, int rowBytes, int height)
  * using CFRelease().
  * Returns NULL on an error.
  */
  * using CFRelease().
  * Returns NULL on an error.
  */

-  
+

 CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
 {
     CGContextRef bitmap;
 CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
 {
     CGContextRef bitmap;


@@ -111,7 +111,7 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     long bytewidth;
     GLint width, height;
     long bytes;
     long bytewidth;
     GLint width, height;
     long bytes;

-    
+

     CGLContextObj    glContextObj;
     CGLPixelFormatObj pixelFormatObj ;
     GLint numPixelFormats ;
     CGLContextObj    glContextObj;
     CGLPixelFormatObj pixelFormatObj ;
     GLint numPixelFormats ;


@@ -122,13 +122,13 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
         (CGLPixelFormatAttribute) 0,    /* Display mask bit goes here */
         (CGLPixelFormatAttribute) 0
     } ;
         (CGLPixelFormatAttribute) 0,    /* Display mask bit goes here */
         (CGLPixelFormatAttribute) 0
     } ;

-    
-    
+
+

     if ( display == kCGNullDirectDisplay )
         display = CGMainDisplayID();
     attribs[2] = (CGLPixelFormatAttribute) CGDisplayIDToOpenGLDisplayMask(display);
     if ( display == kCGNullDirectDisplay )
         display = CGMainDisplayID();
     attribs[2] = (CGLPixelFormatAttribute) CGDisplayIDToOpenGLDisplayMask(display);

-    
-    
+
+

     /* Build a full-screen GL context */
     CGLChoosePixelFormat( attribs, &pixelFormatObj, &numPixelFormats );
     if ( pixelFormatObj == NULL )    // No full screen context support
     /* Build a full-screen GL context */
     CGLChoosePixelFormat( attribs, &pixelFormatObj, &numPixelFormats );
     if ( pixelFormatObj == NULL )    // No full screen context support


@@ -137,23 +137,23 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     CGLDestroyPixelFormat( pixelFormatObj ) ;
     if ( glContextObj == NULL )
         return NULL;
     CGLDestroyPixelFormat( pixelFormatObj ) ;
     if ( glContextObj == NULL )
         return NULL;

-    
-    
+
+

     CGLSetCurrentContext( glContextObj ) ;
     CGLSetFullScreen( glContextObj ) ;
     CGLSetCurrentContext( glContextObj ) ;
     CGLSetFullScreen( glContextObj ) ;

-    
-    
+
+

     glReadBuffer(GL_FRONT);
     glReadBuffer(GL_FRONT);

-    
-    
+
+

     width = (GLint)srcRect.size.width;
     height = (GLint)srcRect.size.height;
     width = (GLint)srcRect.size.width;
     height = (GLint)srcRect.size.height;

-    
-    
+
+

     bytewidth = width * 4; // Assume 4 bytes/pixel for now
     bytewidth = (bytewidth + 3) & ~3; // Align to 4 bytes
     bytes = bytewidth * height; // width * height
     bytewidth = width * 4; // Assume 4 bytes/pixel for now
     bytewidth = (bytewidth + 3) & ~3; // Align to 4 bytes
     bytes = bytewidth * height; // width * height

-    
+

     /* Build bitmap context */
     data = malloc(height * bytewidth);
     if ( data == NULL )
     /* Build bitmap context */
     data = malloc(height * bytewidth);
     if ( data == NULL )


@@ -165,15 +165,15 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
     }
     bitmap = CGBitmapContextCreate(data, width, height, 8, bytewidth,
                                    wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst /* XRGB */);
     }
     bitmap = CGBitmapContextCreate(data, width, height, 8, bytewidth,
                                    wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst /* XRGB */);

-    
-    
+
+

     /* Read framebuffer into our bitmap */
     glFinish(); /* Finish all OpenGL commands */
     glPixelStorei(GL_PACK_ALIGNMENT, 4); /* Force 4-byte alignment */
     glPixelStorei(GL_PACK_ROW_LENGTH, 0);
     glPixelStorei(GL_PACK_SKIP_ROWS, 0);
     glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
     /* Read framebuffer into our bitmap */
     glFinish(); /* Finish all OpenGL commands */
     glPixelStorei(GL_PACK_ALIGNMENT, 4); /* Force 4-byte alignment */
     glPixelStorei(GL_PACK_ROW_LENGTH, 0);
     glPixelStorei(GL_PACK_SKIP_ROWS, 0);
     glPixelStorei(GL_PACK_SKIP_PIXELS, 0);

-    
+

     /*
      * Fetch the data in XRGB format, matching the bitmap context.
      */
     /*
      * Fetch the data in XRGB format, matching the bitmap context.
      */


@@ -193,21 +193,21 @@ CGImageRef grabViaOpenGL(CGDirectDisplayID display, CGRect srcRect)
      * invert it. Pixel reformatting can also be done here.
      */
     swizzleBitmap(data, bytewidth, height);
      * invert it. Pixel reformatting can also be done here.
      */
     swizzleBitmap(data, bytewidth, height);

-    
-    
+
+

     /* Make an image out of our bitmap; does a cheap vm_copy of the bitmap */
     image = CGBitmapContextCreateImage(bitmap);
     /* Make an image out of our bitmap; does a cheap vm_copy of the bitmap */
     image = CGBitmapContextCreateImage(bitmap);

-    
+

     /* Get rid of bitmap */
     CFRelease(bitmap);
     free(data);
     /* Get rid of bitmap */
     CFRelease(bitmap);
     free(data);

-    
-    
+
+

     /* Get rid of GL context */
     CGLSetCurrentContext( NULL );
     CGLClearDrawable( glContextObj ); // disassociate from full screen
     CGLDestroyContext( glContextObj ); // and destroy the context
     /* Get rid of GL context */
     CGLSetCurrentContext( NULL );
     CGLClearDrawable( glContextObj ); // disassociate from full screen
     CGLDestroyContext( glContextObj ); // and destroy the context

-    
+

     /* Returned image has a reference count of 1 */
     return image;
 }
     /* Returned image has a reference count of 1 */
     return image;
 }

diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index 2a35960274f03bd520af963fa964bfb8ae95a590..87098dfd721c2de1fa8b0570804893fc09afc94b 100644 (file)
--- a/src/osx/core/hid.cpp
+++ b/src/osx/core/hid.cpp
@@ -655,7 +655,7 @@ class wxHIDModule : public wxModule
         {
             for(size_t i = 0; i < sm_keyboards.GetCount(); ++i)
                 delete (wxHIDKeyboard*) sm_keyboards[i];
         {
             for(size_t i = 0; i < sm_keyboards.GetCount(); ++i)
                 delete (wxHIDKeyboard*) sm_keyboards[i];

-               sm_keyboards.Clear(); 
+            sm_keyboards.Clear();

         }
 };
 
         }
 };
 

diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index 5fb651f34a9c77d5ca829b72304c5e4cd6ac5986..d21e47cc4fa357b0b012f131fd7926cd1075db57 100644 (file)
--- a/src/osx/core/hidjoystick.cpp
+++ b/src/osx/core/hidjoystick.cpp
@@ -901,4 +901,4 @@ void* wxJoystickThread::Entry()
     }
 }
 
     }
 }
 

-#endif // wxUSE_JOYSTICK 
+#endif // wxUSE_JOYSTICK

diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index 3e14c848dcee8fad2a04b41a605e0849019599d0..53cf637057fb482ad70817dc5467efa5a23f21e8 100644 (file)
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -89,17 +89,17 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     {
         papersize = data.GetPaperSize();
     }
     {
         papersize = data.GetPaperSize();
     }

-    
+

     if ( papersize != wxDefaultSize )
     {
         papersize.x = (wxInt32) (papersize.x * mm2pt);
         papersize.y = (wxInt32) (papersize.y * mm2pt);
     if ( papersize != wxDefaultSize )
     {
         papersize.x = (wxInt32) (papersize.x * mm2pt);
         papersize.y = (wxInt32) (papersize.y * mm2pt);

-        
+

         double height, width;
         PMPaperGetHeight(m_macPaper, &height);
         PMPaperGetWidth(m_macPaper, &width);
         double height, width;
         PMPaperGetHeight(m_macPaper, &height);
         PMPaperGetWidth(m_macPaper, &width);

-        
-        if ( fabs( width - papersize.x ) >= 5 || 
+
+        if ( fabs( width - papersize.x ) >= 5 ||

             fabs( height - papersize.y ) >= 5 )
         {
             // we have to change the current paper
             fabs( height - papersize.y ) >= 5 )
         {
             // we have to change the current paper


@@ -113,7 +113,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
                     PMPaper paper = (PMPaper) CFArrayGetValueAtIndex( paperlist, i );
                     PMPaperGetHeight(paper, &height);
                     PMPaperGetWidth(paper, &width);
                     PMPaper paper = (PMPaper) CFArrayGetValueAtIndex( paperlist, i );
                     PMPaperGetHeight(paper, &height);
                     PMPaperGetWidth(paper, &width);

-                    if ( fabs( width - papersize.x ) < 5 && 
+                    if ( fabs( width - papersize.x ) < 5 &&

                         fabs( height - papersize.y ) < 5 )
                     {
                         // TODO test for duplicate hits and use additional
                         fabs( height - papersize.y ) < 5 )
                     {
                         // TODO test for duplicate hits and use additional


@@ -125,7 +125,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
                 if ( bestPaper == kPMNoData )
                 {
                     const PMPaperMargins margins = { 0.0, 0.0, 0.0, 0.0 };
                 if ( bestPaper == kPMNoData )
                 {
                     const PMPaperMargins margins = { 0.0, 0.0, 0.0, 0.0 };

-                    wxString id, name(wxT("Custom paper"));                    
+                    wxString id, name(wxT("Custom paper"));

                     id.Printf(wxT("wxPaperCustom%dx%d"), papersize.x, papersize.y);
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
                     id.Printf(wxT("wxPaperCustom%dx%d"), papersize.x, papersize.y);
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5


@@ -135,10 +135,10 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif
                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif

-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

                     if ( paper == kPMNoData )
                     {
                     if ( paper == kPMNoData )
                     {

-                        PMPaperCreate(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ), 
+                        PMPaperCreate(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ),

                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif
                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif


@@ -159,7 +159,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     CFArrayRef printerList;
     CFIndex index, count;
     CFStringRef name;
     CFArrayRef printerList;
     CFIndex index, count;
     CFStringRef name;

-    
+

     if (PMServerCreatePrinterList(kPMServerLocal, &printerList) == noErr)
     {
         count = CFArrayGetCount(printerList);
     if (PMServerCreatePrinterList(kPMServerLocal, &printerList) == noErr)
     {
         count = CFArrayGetCount(printerList);


@@ -180,7 +180,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
             PMSessionSetCurrentPMPrinter(m_macPrintSession, printer);
         CFRelease(printerList);
     }
             PMSessionSetCurrentPMPrinter(m_macPrintSession, printer);
         CFRelease(printerList);
     }

-    
+

     PMSetCopies( m_macPrintSettings , data.GetNoCopies() , false ) ;
     PMSetCollate(m_macPrintSettings, data.GetCollate());
     if ( data.IsOrientationReversed() )
     PMSetCopies( m_macPrintSettings , data.GetNoCopies() , false ) ;
     PMSetCollate(m_macPrintSettings, data.GetCollate());
     if ( data.IsOrientationReversed() )


@@ -189,7 +189,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     else
         PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMLandscape : kPMPortrait , false ) ;
     else
         PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMLandscape : kPMPortrait , false ) ;

-    
+

     PMDuplexMode mode = 0 ;
     switch( data.GetDuplex() )
     {
     PMDuplexMode mode = 0 ;
     switch( data.GetDuplex() )
     {


@@ -207,15 +207,15 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     PMSetDuplex(  m_macPrintSettings, mode ) ;
 
     // PMQualityMode not yet accessible via API
     PMSetDuplex(  m_macPrintSettings, mode ) ;
 
     // PMQualityMode not yet accessible via API

-    
-    
+
+

     if ( data.IsOrientationReversed() )
         PMSetOrientation(  m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMReverseLandscape : kPMReversePortrait , false ) ;
     else
         PMSetOrientation(  m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMLandscape : kPMPortrait , false ) ;
     if ( data.IsOrientationReversed() )
         PMSetOrientation(  m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMReverseLandscape : kPMReversePortrait , false ) ;
     else
         PMSetOrientation(  m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMLandscape : kPMPortrait , false ) ;

-    
+

 #ifndef __LP64__
     // PMQualityMode not accessible via API
     // TODO: use our quality property to determine optimal resolution
 #ifndef __LP64__
     // PMQualityMode not accessible via API
     // TODO: use our quality property to determine optimal resolution


@@ -225,9 +225,9 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     PMSetResolution( m_macPageFormat, &res);
 #endif
 
     PMSetResolution( m_macPageFormat, &res);
 #endif
 

-    // after setting the new resolution the format has to be updated, otherwise the page rect remains 
+    // after setting the new resolution the format has to be updated, otherwise the page rect remains

     // at the 'old' scaling
     // at the 'old' scaling

-    
+

     PMSessionValidatePageFormat(m_macPrintSession,
         m_macPageFormat, kPMDontWantBoolean);
     PMSessionValidatePrintSettings(m_macPrintSession,
     PMSessionValidatePageFormat(m_macPrintSession,
         m_macPageFormat, kPMDontWantBoolean);
     PMSessionValidatePrintSettings(m_macPrintSession,


@@ -269,7 +269,7 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data )
     Boolean collate;
     if (PMGetCollate(m_macPrintSettings, &collate) == noErr)
         data.SetCollate(collate);
     Boolean collate;
     if (PMGetCollate(m_macPrintSettings, &collate) == noErr)
         data.SetCollate(collate);

-    
+

     CFStringRef name;
     PMPrinter printer ;
     PMSessionGetCurrentPrinter( m_macPrintSession, &printer );
     CFStringRef name;
     PMPrinter printer ;
     PMSessionGetCurrentPrinter( m_macPrintSession, &printer );


@@ -281,7 +281,7 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data )
         CFRetain(name);
         data.SetPrinterName(wxCFStringRef(name).AsString());
     }
         CFRetain(name);
         data.SetPrinterName(wxCFStringRef(name).AsString());
     }

-    
+

     PMDuplexMode mode = 0 ;
     PMGetDuplex(  m_macPrintSettings, &mode ) ;
     switch( mode )
     PMDuplexMode mode = 0 ;
     PMGetDuplex(  m_macPrintSettings, &mode ) ;
     switch( mode )


@@ -298,7 +298,7 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data )
             break ;
     }
     // PMQualityMode not yet accessible via API
             break ;
     }
     // PMQualityMode not yet accessible via API

-    
+

     double height, width;
     PMPaperGetHeight(m_macPaper, &height);
     PMPaperGetWidth(m_macPaper, &width);
     double height, width;
     PMPaperGetHeight(m_macPaper, &height);
     PMPaperGetWidth(m_macPaper, &width);


@@ -636,10 +636,10 @@ void wxMacPrintPreview::DetermineScaling(void)
 
     wxSize ppiScreen( 72 , 72 ) ;
     wxSize ppiPrinter( 72 , 72 ) ;
 
     wxSize ppiScreen( 72 , 72 ) ;
     wxSize ppiPrinter( 72 , 72 ) ;

-    
+

     // Note that with Leopard, screen dpi=72 is no longer a given
     m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;
     // Note that with Leopard, screen dpi=72 is no longer a given
     m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;

-    
+

     wxCoord w , h ;
     wxCoord ww, hh;
     wxRect paperRect;
     wxCoord w , h ;
     wxCoord ww, hh;
     wxRect paperRect;


@@ -666,7 +666,7 @@ void wxMacPrintPreview::DetermineScaling(void)
     }
     m_pageWidth = w;
     m_pageHeight = h;
     }
     m_pageWidth = w;
     m_pageHeight = h;

-    
+

     m_previewPrintout->SetPageSizePixels(w , h) ;
     m_previewPrintout->SetPageSizeMM(ww, hh);
     m_previewPrintout->SetPaperRectPixels(paperRect);
     m_previewPrintout->SetPageSizePixels(w , h) ;
     m_previewPrintout->SetPageSizeMM(ww, hh);
     m_previewPrintout->SetPaperRectPixels(paperRect);


@@ -694,7 +694,7 @@ wxOSXCarbonPrintData::wxOSXCarbonPrintData()
                     m_macPageFormat);
             PMGetPageFormatPaper(m_macPageFormat, &m_macPaper);
         }
                     m_macPageFormat);
             PMGetPageFormatPaper(m_macPageFormat, &m_macPaper);
         }

-        
+

         if ( PMCreatePrintSettings(&m_macPrintSettings) == noErr )
         {
             PMSessionDefaultPrintSettings(m_macPrintSession,
         if ( PMCreatePrintSettings(&m_macPrintSettings) == noErr )
         {
             PMSessionDefaultPrintSettings(m_macPrintSession,

diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp
index 041b8194955617834095ea7814dc2f0a4195ba7f..8a1cee42a5ddfec0dd0a171c540db503235654b0 100644 (file)
--- a/src/osx/core/stdpaths_cf.cpp
+++ b/src/osx/core/stdpaths_cf.cpp
@@ -154,7 +154,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 #else
     FSSpec fsSpec;
 #endif
 #else
     FSSpec fsSpec;
 #endif

-    
+

     procno.highLongOfPSN = 0 ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     procno.highLongOfPSN = 0 ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);


@@ -164,7 +164,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 #else
     processinfo.processAppSpec = &fsSpec;
 #endif
 #else
     processinfo.processAppSpec = &fsSpec;
 #endif

-    
+

     GetProcessInformation( &procno , &processinfo ) ;
 #ifdef __LP64__
     return wxMacFSRefToPath(&fsRef);
     GetProcessInformation( &procno , &processinfo ) ;
 #ifdef __LP64__
     return wxMacFSRefToPath(&fsRef);


@@ -172,7 +172,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
     return wxMacFSSpec2MacFilename(&fsSpec);
 #endif
 #endif
     return wxMacFSSpec2MacFilename(&fsSpec);
 #endif
 #endif

-    
+

 #else
     return wxStandardPathsBase::GetExecutablePath();
 #endif
 #else
     return wxStandardPathsBase::GetExecutablePath();
 #endif

diff --git a/src/osx/core/strconv_cf.cpp b/src/osx/core/strconv_cf.cpp
index 78f6429c2c7114350114f79d064f5b549b266d79..4355ee032a8d899aaf44a0c0b848ea0095f607b8 100644 (file)
--- a/src/osx/core/strconv_cf.cpp
+++ b/src/osx/core/strconv_cf.cpp
@@ -130,11 +130,11 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
         else
         {
             // NOTE: Includes NULL iff source did
         else
         {
             // NOTE: Includes NULL iff source did

-            /* NOTE: This is an approximation.  The eventual UTF-32 will    
+            /* NOTE: This is an approximation.  The eventual UTF-32 will

              * possibly have less elements but certainly not more.
              */
             size_t returnSize = CFStringGetLength(theString);
              * possibly have less elements but certainly not more.
              */
             size_t returnSize = CFStringGetLength(theString);

-    
+

             if (dstSize == 0 || dst == NULL)
             {
                 return returnSize;
             if (dstSize == 0 || dst == NULL)
             {
                 return returnSize;


@@ -144,13 +144,13 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
             // for an undersized UTF-32 destination buffer.
             CFRange fullStringRange = CFRangeMake(0, CFStringGetLength(theString));
             UniChar *szUniCharBuffer = new UniChar[fullStringRange.length];
             // for an undersized UTF-32 destination buffer.
             CFRange fullStringRange = CFRangeMake(0, CFStringGetLength(theString));
             UniChar *szUniCharBuffer = new UniChar[fullStringRange.length];

-    
+

             CFStringGetCharacters(theString, fullStringRange, szUniCharBuffer);
             CFStringGetCharacters(theString, fullStringRange, szUniCharBuffer);

-    
+

             wxMBConvUTF16 converter;
             returnSize = converter.ToWChar( dst, dstSize, (const char*)szUniCharBuffer, fullStringRange.length );
             delete [] szUniCharBuffer;
             wxMBConvUTF16 converter;
             returnSize = converter.ToWChar( dst, dstSize, (const char*)szUniCharBuffer, fullStringRange.length );
             delete [] szUniCharBuffer;

-    
+

             return returnSize;
         }
         // NOTREACHED
             return returnSize;
         }
         // NOTREACHED


@@ -205,7 +205,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
         CFIndex usedBufLen;
 
         CFIndex charsConverted = CFStringGetBytes(
         CFIndex usedBufLen;
 
         CFIndex charsConverted = CFStringGetBytes(

-                theString, 
+                theString,

                 CFRangeMake(0, CFStringGetLength(theString)),
                 m_encoding,
                 0, // FAIL on unconvertible characters
                 CFRangeMake(0, CFStringGetLength(theString)),
                 m_encoding,
                 0, // FAIL on unconvertible characters

diff --git a/src/osx/core/timer.cpp b/src/osx/core/timer.cpp
index 3f55f8895c2c1c79fda431de893ecfd4e87a21b3..ce0d98d598726c2281878cef2bfc9261d25cb740 100644 (file)
--- a/src/osx/core/timer.cpp
+++ b/src/osx/core/timer.cpp
@@ -69,7 +69,7 @@ bool wxOSXTimerImpl::Start( int milliseconds, bool mode )
 
     wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
     wxCHECK_MSG( m_info->m_timerRef == NULL, false, wxT("attempting to restart a timer") );
 
     wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
     wxCHECK_MSG( m_info->m_timerRef == NULL, false, wxT("attempting to restart a timer") );

-    
+

     CFGregorianUnits gumilli ;
     memset(&gumilli,0,sizeof(gumilli) );
     gumilli.seconds = m_milli / 1000.0;
     CFGregorianUnits gumilli ;
     memset(&gumilli,0,sizeof(gumilli) );
     gumilli.seconds = m_milli / 1000.0;


@@ -81,13 +81,13 @@ bool wxOSXTimerImpl::Start( int milliseconds, bool mode )
 
     m_info->m_timer = this;
     m_info->m_timerRef = CFRunLoopTimerCreate(
 
     m_info->m_timer = this;
     m_info->m_timerRef = CFRunLoopTimerCreate(

-        kCFAllocatorDefault, 
+        kCFAllocatorDefault,

         CFAbsoluteTimeAddGregorianUnits( CFAbsoluteTimeGetCurrent() , NULL, gumilli ),
         IsOneShot() ? 0 : CFTimeInterval( m_milli / 1000.0 ) ,
         0, 0, wxProcessTimer, &ctx);
         CFAbsoluteTimeAddGregorianUnits( CFAbsoluteTimeGetCurrent() , NULL, gumilli ),
         IsOneShot() ? 0 : CFTimeInterval( m_milli / 1000.0 ) ,
         0, 0, wxProcessTimer, &ctx);

-    
+

     wxASSERT_MSG( m_info->m_timerRef != NULL, wxT("unable to create timer"));
     wxASSERT_MSG( m_info->m_timerRef != NULL, wxT("unable to create timer"));

-    
+

     CFRunLoopRef runLoop = 0;
 #if wxOSX_USE_IPHONE
     runLoop = CFRunLoopGetMain();
     CFRunLoopRef runLoop = 0;
 #if wxOSX_USE_IPHONE
     runLoop = CFRunLoopGetMain();

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index fe8b87c45e532b26ae44a153d16b1324459bf699..ee0a74873957a5f5764fe8161e23ff7b41b6ef8a 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -64,14 +64,14 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
 
 // have a fast version for mac code that returns the version as a return value
 
 
 // have a fast version for mac code that returns the version as a return value
 

-long UMAGetSystemVersion() 
-{ 
+long UMAGetSystemVersion()
+{

     static SInt32 sUMASystemVersion = 0 ;
     if ( sUMASystemVersion == 0 )
     {
         verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
     }
     static SInt32 sUMASystemVersion = 0 ;
     if ( sUMASystemVersion == 0 )
     {
         verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
     }

-    return sUMASystemVersion ; 
+    return sUMASystemVersion ;

 }
 
 // our OS version is the same in non GUI and GUI cases
 }
 
 // our OS version is the same in non GUI and GUI cases

diff --git a/src/osx/iphone/button.mm b/src/osx/iphone/button.mm
index 71a362daf6d1db7e90aef71ade15083d4d55eb38..f897fdd5da115c1518fe5cee4c57f30ca4e32266 100644 (file)
--- a/src/osx/iphone/button.mm
+++ b/src/osx/iphone/button.mm
@@ -31,7 +31,7 @@ wxSize wxButton::DoGetBestSize() const
     wxSize sz = GetDefaultSize() ;
 
     wxRect r ;
     wxSize sz = GetDefaultSize() ;
 
     wxRect r ;

-        
+

     m_peer->GetBestRect(&r);
 
     if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
     m_peer->GetBestRect(&r);
 
     if ( r.GetWidth() == 0 && r.GetHeight() == 0 )


@@ -41,7 +41,7 @@ wxSize wxButton::DoGetBestSize() const
     sz.y = r.GetHeight();
 
     int wBtn = 72;
     sz.y = r.GetHeight();
 
     int wBtn = 72;

-    
+

     if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
         sz.x = wBtn;
 
     if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT))
         sz.x = wBtn;
 


@@ -61,7 +61,7 @@ wxSize wxButton::GetDefaultSize()
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );


@@ -80,14 +80,14 @@ wxSize wxButton::GetDefaultSize()
 @end
 
 
 @end
 
 

-wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID id, 
+wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID id,

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
     CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     UIButtonType buttonType = UIButtonTypeRoundedRect;
 {
     CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     UIButtonType buttonType = UIButtonTypeRoundedRect;


@@ -119,7 +119,7 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
     {
         // Button height is static in Mac, can't be changed, so we need to force it here
         int maxHeight;
     {
         // Button height is static in Mac, can't be changed, so we need to force it here
         int maxHeight;

-        switch (wxpeer->GetWindowVariant() ) 
+        switch (wxpeer->GetWindowVariant() )

         {
             case wxWINDOW_VARIANT_NORMAL:
             case wxWINDOW_VARIANT_LARGE:
         {
             case wxWINDOW_VARIANT_NORMAL:
             case wxWINDOW_VARIANT_LARGE:


@@ -153,21 +153,21 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
 }
 
 void wxWidgetIPhoneImpl::SetDefaultButton( bool isDefault )
 }
 
 void wxWidgetIPhoneImpl::SetDefaultButton( bool isDefault )

-{ 
+{

 }
 
 }
 

-void wxWidgetIPhoneImpl::PerformClick() 
+void wxWidgetIPhoneImpl::PerformClick()

 {
 }
 
 {
 }
 

-wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
-                                    long WXUNUSED(extraStyle)) 
+                                    long WXUNUSED(style),
+                                    long WXUNUSED(extraStyle))

 {
     CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxUIButton* v = [[wxUIButton alloc] initWithFrame:r];
 {
     CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxUIButton* v = [[wxUIButton alloc] initWithFrame:r];

diff --git a/src/osx/iphone/checkbox.mm b/src/osx/iphone/checkbox.mm
index efe49c628122ef6feb2657717d59acf741839122..2fd405258e97cb37161818d4b689859212de9bd7 100644 (file)
--- a/src/osx/iphone/checkbox.mm
+++ b/src/osx/iphone/checkbox.mm
@@ -27,7 +27,7 @@
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );


@@ -46,21 +46,21 @@
 
 @end
 
 
 @end
 

-wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
+wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),

                                     const wxString& WXUNUSED(label),
                                     const wxString& WXUNUSED(label),

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
-                                    long WXUNUSED(extraStyle)) 
+                                    long style,
+                                    long WXUNUSED(extraStyle))

 {
     CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxUISwitch* v = [[wxUISwitch alloc] initWithFrame:r];
 
 //    if (style & wxCHK_3STATE)
 //        [v setAllowsMixedState:YES];
 {
     CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxUISwitch* v = [[wxUISwitch alloc] initWithFrame:r];
 
 //    if (style & wxCHK_3STATE)
 //        [v setAllowsMixedState:YES];

-        
+

     wxWidgetIPhoneImpl* c = new wxWidgetIPhoneImpl( wxpeer, v );
     return c;
 }
     wxWidgetIPhoneImpl* c = new wxWidgetIPhoneImpl( wxpeer, v );
     return c;
 }

diff --git a/src/osx/iphone/msgdlg.mm b/src/osx/iphone/msgdlg.mm
index 4567f105b07d2601509a6a4b072cc10111e595bb..e7598c74a88249725580498a84c7d0ef2eef9675 100644 (file)
--- a/src/osx/iphone/msgdlg.mm
+++ b/src/osx/iphone/msgdlg.mm
@@ -57,7 +57,7 @@ int wxMessageDialog::ShowModal()
         msgtitle = m_message;
         msgtext  = m_extendedMessage;
     }
         msgtitle = m_message;
         msgtext  = m_extendedMessage;
     }

-    
+

     wxCFStringRef cfNoString( GetNoLabel(), GetFont().GetEncoding() );
     wxCFStringRef cfYesString( GetYesLabel(), GetFont().GetEncoding() );
     wxCFStringRef cfOKString( GetOKLabel(), GetFont().GetEncoding() );
     wxCFStringRef cfNoString( GetNoLabel(), GetFont().GetEncoding() );
     wxCFStringRef cfYesString( GetYesLabel(), GetFont().GetEncoding() );
     wxCFStringRef cfOKString( GetOKLabel(), GetFont().GetEncoding() );


@@ -67,7 +67,7 @@ int wxMessageDialog::ShowModal()
     wxCFStringRef cfText( msgtext, GetFont().GetEncoding() );
 
     UIAlertView* alert = [[UIAlertView alloc] initWithTitle:cfTitle.AsNSString() message:cfText.AsNSString() delegate:nil cancelButtonTitle:nil otherButtonTitles:nil];
     wxCFStringRef cfText( msgtext, GetFont().GetEncoding() );
 
     UIAlertView* alert = [[UIAlertView alloc] initWithTitle:cfTitle.AsNSString() message:cfText.AsNSString() delegate:nil cancelButtonTitle:nil otherButtonTitles:nil];

-    
+

     int buttonId[3] = { 0, 0, 0 };
     int buttonCount = 0;
 
     int buttonId[3] = { 0, 0, 0 };
     int buttonCount = 0;
 


@@ -109,8 +109,8 @@ int wxMessageDialog::ShowModal()
 
     wxNonOwnedWindow* parentWindow = NULL;
     int button = -1;
 
     wxNonOwnedWindow* parentWindow = NULL;
     int button = -1;

-            
-    if (GetParent()) 
+
+    if (GetParent())

     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }
     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }


@@ -119,9 +119,9 @@ int wxMessageDialog::ShowModal()
     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();
     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();

-        ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-        [alert beginSheetModalForWindow: nativeParent modalDelegate: sheetDelegate 
-            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+        ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+        [alert beginSheetModalForWindow: nativeParent modalDelegate: sheetDelegate
+            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

             contextInfo: nil];
         [sheetDelegate waitForSheetToFinish];
         button = [sheetDelegate code];
             contextInfo: nil];
         [sheetDelegate waitForSheetToFinish];
         button = [sheetDelegate code];


@@ -133,6 +133,6 @@ int wxMessageDialog::ShowModal()
         [alert show];
     }
     // [alert release];
         [alert show];
     }
     // [alert release];

-    
+

     return wxID_CANCEL;
 }
     return wxID_CANCEL;
 }

diff --git a/src/osx/iphone/nonownedwnd.mm b/src/osx/iphone/nonownedwnd.mm
index 609b4039bdbcfbc5a7797e698a7402ccc210b893..6b484a5fda807f4d4e1adf67dec7a939299ea421 100644 (file)
--- a/src/osx/iphone/nonownedwnd.mm
+++ b/src/osx/iphone/nonownedwnd.mm
@@ -51,19 +51,19 @@ wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p )
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowIPhoneImpl , wxNonOwnedWindowImpl )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowIPhoneImpl , wxNonOwnedWindowImpl )
 

-wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) : 
+wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) :

     wxNonOwnedWindowImpl(nonownedwnd)
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }
     wxNonOwnedWindowImpl(nonownedwnd)
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }

-    
-wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl() 
+
+wxNonOwnedWindowIPhoneImpl::wxNonOwnedWindowIPhoneImpl()

 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }

-    
+

 wxNonOwnedWindowIPhoneImpl::~wxNonOwnedWindowIPhoneImpl()
 {
     [m_macWindow release];
 wxNonOwnedWindowIPhoneImpl::~wxNonOwnedWindowIPhoneImpl()
 {
     [m_macWindow release];


@@ -78,11 +78,11 @@ void wxNonOwnedWindowIPhoneImpl::Create( wxWindow* parent, const wxPoint& pos, c
 long style, long extraStyle, const wxString& name )
 {
     m_macWindow = [UIWindow alloc];
 long style, long extraStyle, const wxString& name )
 {
     m_macWindow = [UIWindow alloc];

-    
+

     UIWindowLevel level = UIWindowLevelNormal;
     UIWindowLevel level = UIWindowLevelNormal;

-    
+

     // most styles are not supported on the iphone
     // most styles are not supported on the iphone

-    
+

     if ( style & wxFRAME_TOOL_WINDOW )
     {
         level = UIWindowLevelAlert; ;
     if ( style & wxFRAME_TOOL_WINDOW )
     {
         level = UIWindowLevelAlert; ;


@@ -102,11 +102,11 @@ long style, long extraStyle, const wxString& name )
     }
 
     if ( ( style & wxSTAY_ON_TOP ) )
     }
 
     if ( ( style & wxSTAY_ON_TOP ) )

-        level = UIWindowLevelAlert;    
+        level = UIWindowLevelAlert;

     CGRect r = CGRectMake( 0, 0, size.x, size.y) ;
     CGRect r = CGRectMake( 0, 0, size.x, size.y) ;

-    
+

     [m_macWindow initWithFrame:r ];
     [m_macWindow initWithFrame:r ];

-        
+

     [m_macWindow setWindowLevel:level];
     // [m_macWindow makeKeyAndOrderFront:nil];
 }
     [m_macWindow setWindowLevel:level];
     // [m_macWindow makeKeyAndOrderFront:nil];
 }


@@ -120,7 +120,7 @@ WXWindow wxNonOwnedWindowIPhoneImpl::GetWXWindow() const
 void wxNonOwnedWindowIPhoneImpl::Raise()
 {
 }
 void wxNonOwnedWindowIPhoneImpl::Raise()
 {
 }

-    
+

 void wxNonOwnedWindowIPhoneImpl::Lower()
 {
 }
 void wxNonOwnedWindowIPhoneImpl::Lower()
 {
 }


@@ -135,7 +135,7 @@ bool wxNonOwnedWindowIPhoneImpl::Show(bool show)
     }
     return true;
 }
     }
     return true;
 }

-    
+

 bool wxNonOwnedWindowIPhoneImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout)
 {
     return Show(show);
 bool wxNonOwnedWindowIPhoneImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout)
 {
     return Show(show);


@@ -161,12 +161,12 @@ void wxNonOwnedWindowIPhoneImpl::SetExtraStyle( long exStyle )
 {
     // no special styles supported
 }
 {
     // no special styles supported
 }

-    
+

 bool wxNonOwnedWindowIPhoneImpl::SetBackgroundStyle(wxBackgroundStyle style)
 {
     return true;
 }
 bool wxNonOwnedWindowIPhoneImpl::SetBackgroundStyle(wxBackgroundStyle style)
 {
     return true;
 }

-    
+

 bool wxNonOwnedWindowIPhoneImpl::CanSetTransparent()
 {
     return true;
 bool wxNonOwnedWindowIPhoneImpl::CanSetTransparent()
 {
     return true;


@@ -200,31 +200,31 @@ void wxNonOwnedWindowIPhoneImpl::GetContentArea( int& left, int &top, int &width
     left = rect.origin.x;
     top = rect.origin.y;
 }
     left = rect.origin.x;
     top = rect.origin.y;
 }

-    
+

 bool wxNonOwnedWindowIPhoneImpl::SetShape(const wxRegion& region)
 {
     return false;
 }
 
 bool wxNonOwnedWindowIPhoneImpl::SetShape(const wxRegion& region)
 {
     return false;
 }
 

-void wxNonOwnedWindowIPhoneImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) 
+void wxNonOwnedWindowIPhoneImpl::SetTitle( const wxString& title, wxFontEncoding encoding )

 {
 // TODO change title of app ?
 }
 {
 // TODO change title of app ?
 }

-    
+

 bool wxNonOwnedWindowIPhoneImpl::IsMaximized() const
 {
     return false;
 }
 bool wxNonOwnedWindowIPhoneImpl::IsMaximized() const
 {
     return false;
 }

-    
+

 bool wxNonOwnedWindowIPhoneImpl::IsIconized() const
 {
     return false;
 }
 bool wxNonOwnedWindowIPhoneImpl::IsIconized() const
 {
     return false;
 }

-    
+

 void wxNonOwnedWindowIPhoneImpl::Iconize( bool iconize )
 {
 }
 void wxNonOwnedWindowIPhoneImpl::Iconize( bool iconize )
 {
 }

-    
+

 void wxNonOwnedWindowIPhoneImpl::Maximize(bool maximize)
 {
 }
 void wxNonOwnedWindowIPhoneImpl::Maximize(bool maximize)
 {
 }


@@ -233,9 +233,9 @@ bool wxNonOwnedWindowIPhoneImpl::IsFullScreen() const
 {
     return m_macFullScreenData != NULL ;
 }
 {
     return m_macFullScreenData != NULL ;
 }

-    
+

 bool wxNonOwnedWindowIPhoneImpl::ShowFullScreen(bool show, long style)
 bool wxNonOwnedWindowIPhoneImpl::ShowFullScreen(bool show, long style)

-{    
+{

     return true;
 }
 
     return true;
 }
 

diff --git a/src/osx/iphone/utils.mm b/src/osx/iphone/utils.mm
index 8c780ac93dd28caa61bfc5bf24716cce53548400..565f345f3dd8e31a32306b47c02544578f833abe 100644 (file)
--- a/src/osx/iphone/utils.mm
+++ b/src/osx/iphone/utils.mm
@@ -145,7 +145,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *width = r.size.width;
     if ( height )
         *height = r.size.height;
         *width = r.size.width;
     if ( height )
         *height = r.size.height;

-    
+

 }
 
 void wxGetMousePosition( int* x, int* y )
 }
 
 void wxGetMousePosition( int* x, int* y )


@@ -163,7 +163,7 @@ int wxDisplayDepth()
 void wxDisplaySize(int *width, int *height)
 {
     CGRect bounds = [[UIScreen mainScreen] bounds];
 void wxDisplaySize(int *width, int *height)
 {
     CGRect bounds = [[UIScreen mainScreen] bounds];

-    
+

     if ( width )
         *width = (int)bounds.size.width ;
     if ( height )
     if ( width )
         *width = (int)bounds.size.width ;
     if ( height )


@@ -224,21 +224,21 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     // call this method when a Blit is performed with it as a source.
     if (!m_window)
         return wxNullBitmap;
     // call this method when a Blit is performed with it as a source.
     if (!m_window)
         return wxNullBitmap;

-        
+

     wxSize sz = m_window->GetSize();
     wxSize sz = m_window->GetSize();

-    
+

     int left = subrect != NULL ? subrect->x : 0 ;
     int top = subrect != NULL ? subrect->y : 0 ;
     int width = subrect != NULL ? subrect->width : sz.x;
     int height = subrect !=  NULL ? subrect->height : sz.y ;
     int left = subrect != NULL ? subrect->x : 0 ;
     int top = subrect != NULL ? subrect->y : 0 ;
     int width = subrect != NULL ? subrect->width : sz.x;
     int height = subrect !=  NULL ? subrect->height : sz.y ;

-    
+

     wxBitmap bmp = wxBitmap(width, height, 32);
     wxBitmap bmp = wxBitmap(width, height, 32);

-    
+

     CGContextRef context = (CGContextRef)bmp.GetHBITMAP();
     CGContextRef context = (CGContextRef)bmp.GetHBITMAP();

-    
+

     CGContextSaveGState(context);
     CGContextSaveGState(context);

-    
-    
+
+

     CGContextTranslateCTM( context, 0,  height );
     CGContextScaleCTM( context, 1, -1 );
 
     CGContextTranslateCTM( context, 0,  height );
     CGContextScaleCTM( context, 1, -1 );
 

diff --git a/src/osx/iphone/window.mm b/src/osx/iphone/window.mm
index bcb8bc43659518b4b365e72c1fd653e223fa5a5f..fba3d8c8f719da2bba16c70f15d8837d899d4036 100644 (file)
--- a/src/osx/iphone/window.mm
+++ b/src/osx/iphone/window.mm
@@ -30,7 +30,7 @@ WXWidget wxWidgetImpl::FindFocus()
     {
     /*
         NSResponder* responder = [keyWindow firstResponder];
     {
     /*
         NSResponder* responder = [keyWindow firstResponder];

-        if ( [responder isKindOfClass:[NSTextView class]] && 
+        if ( [responder isKindOfClass:[NSTextView class]] &&

             [keyWindow fieldEditor:NO forObject:nil] != nil )
         {
             focusedView = [(NSTextView*)responder delegate];
             [keyWindow fieldEditor:NO forObject:nil] != nil )
         {
             focusedView = [(NSTextView*)responder delegate];


@@ -98,7 +98,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
     UITouch *touch = [touches anyObject];
 
     // these parameters are not given for all events
     UITouch *touch = [touches anyObject];
 
     // these parameters are not given for all events

-    UInt32 button = 0; // no secondary button 
+    UInt32 button = 0; // no secondary button

     UInt32 clickCount = [touch tapCount];
     UInt32 mouseChord = 0; // TODO does this exist for cocoa
 
     UInt32 clickCount = [touch tapCount];
     UInt32 mouseChord = 0; // TODO does this exist for cocoa
 


@@ -196,7 +196,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
 + (void)initialize
 {
     static BOOL initialized = NO;
 + (void)initialize
 {
     static BOOL initialized = NO;

-    if (!initialized) 
+    if (!initialized)

     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );
     {
         initialized = YES;
         wxOSXIPhoneClassAddWXMethods( self );


@@ -214,13 +214,13 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
         CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
         CGContextSaveGState( context );
         // draw background
         CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
         CGContextSaveGState( context );
         // draw background

-        
+

         CGContextSetFillColorWithColor( context, impl->GetWXPeer()->GetBackgroundColour().GetCGColor());
         CGContextFillRect(context, rect );
 
         impl->GetWXPeer()->MacSetCGContextRef( context );
 
         CGContextSetFillColorWithColor( context, impl->GetWXPeer()->GetBackgroundColour().GetCGColor());
         CGContextFillRect(context, rect );
 
         impl->GetWXPeer()->MacSetCGContextRef( context );
 

-        impl->GetWXPeer()->GetUpdateRegion() = 
+        impl->GetWXPeer()->GetUpdateRegion() =

             wxRegion(rect.origin.x,rect.origin.y,rect.size.width,rect.size.height) ;
 
         wxPaintEvent event;
             wxRegion(rect.origin.x,rect.origin.y,rect.size.width,rect.size.height) ;
 
         wxPaintEvent event;


@@ -233,25 +233,25 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
 
 }
 
 
 }
 

-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event 
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event

 {
     [self handleTouchEvent:touches withEvent:event];
 }
 
 {
     [self handleTouchEvent:touches withEvent:event];
 }
 

-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event 
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event

 {
     [self handleTouchEvent:touches withEvent:event];
 }
 
 {
     [self handleTouchEvent:touches withEvent:event];
 }
 

-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event 
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event

 {
     [self handleTouchEvent:touches withEvent:event];
 }
 
 {
     [self handleTouchEvent:touches withEvent:event];
 }
 

--(void)handleTouchEvent:(NSSet *)touches withEvent:(UIEvent *)event 
-{ 
+-(void)handleTouchEvent:(NSSet *)touches withEvent:(UIEvent *)event
+{

     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );

-    CGPoint clickLocation; 
+    CGPoint clickLocation;

     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:self];
 
     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:self];
 


@@ -266,12 +266,12 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSSet* touches, UIEvent * nsEvent
 
 */
 
 
 */
 

-void wxOSX_touchEvent(UIView* self, SEL _cmd, NSSet* touches, UIEvent *event ) 
+void wxOSX_touchEvent(UIView* self, SEL _cmd, NSSet* touches, UIEvent *event )

 {
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
 {
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     impl->touchEvent(touches, event, self, _cmd);
 }
 
     impl->touchEvent(touches, event, self, _cmd);
 }
 


@@ -280,7 +280,7 @@ BOOL wxOSX_becomeFirstResponder(UIView* self, SEL _cmd)
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->becomeFirstResponder(self, _cmd);
 }
 
     return impl->becomeFirstResponder(self, _cmd);
 }
 


@@ -289,7 +289,7 @@ BOOL wxOSX_resignFirstResponder(UIView* self, SEL _cmd)
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return NO;

-        
+

     return impl->resignFirstResponder(self, _cmd);
 }
 
     return impl->resignFirstResponder(self, _cmd);
 }
 


@@ -298,7 +298,7 @@ void wxOSX_drawRect(UIView* self, SEL _cmd, CGRect rect)
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;
     wxWidgetIPhoneImpl* impl = (wxWidgetIPhoneImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     if (impl == NULL)
         return;

-        
+

     return impl->drawRect(&rect, self, _cmd);
 }
 
     return impl->drawRect(&rect, self, _cmd);
 }
 


@@ -344,7 +344,7 @@ wxWidgetIPhoneImpl::wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isR
 {
 }
 
 {
 }
 

-wxWidgetIPhoneImpl::wxWidgetIPhoneImpl() 
+wxWidgetIPhoneImpl::wxWidgetIPhoneImpl()

 {
 }
 
 {
 }
 


@@ -365,8 +365,8 @@ wxWidgetIPhoneImpl::~wxWidgetIPhoneImpl()
     }
     [m_osxView release];
 }
     }
     [m_osxView release];
 }

-    
-bool wxWidgetIPhoneImpl::IsVisible() const 
+
+bool wxWidgetIPhoneImpl::IsVisible() const

 {
     // TODO reflect Superviews state
     return [m_osxView isHidden] == NO;
 {
     // TODO reflect Superviews state
     return [m_osxView isHidden] == NO;


@@ -381,7 +381,7 @@ void wxWidgetIPhoneImpl::Raise()
 {
     [[m_osxView superview] bringSubviewToFront:m_osxView];
 }
 {
     [[m_osxView superview] bringSubviewToFront:m_osxView];
 }

-    
+

 void wxWidgetIPhoneImpl::Lower()
 {
     [[m_osxView superview] sendSubviewToBack:m_osxView];
 void wxWidgetIPhoneImpl::Lower()
 {
     [[m_osxView superview] sendSubviewToBack:m_osxView];


@@ -446,7 +446,7 @@ bool wxWidgetIPhoneImpl::HasFocus() const
     return [m_osxView isFirstResponder] == YES;
 }
 
     return [m_osxView isFirstResponder] == YES;
 }
 

-bool wxWidgetIPhoneImpl::SetFocus() 
+bool wxWidgetIPhoneImpl::SetFocus()

 {
 //    [m_osxView makeKeyWindow] ;
 //  TODO
 {
 //    [m_osxView makeKeyWindow] ;
 //  TODO


@@ -469,7 +469,7 @@ void wxWidgetIPhoneImpl::Embed( wxWidgetImpl *parent )
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     CGPoint p = CGPointMake( pt->x , pt->y );
 void  wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
 {
     CGPoint p = CGPointMake( pt->x , pt->y );

-    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; 
+    p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ];

     pt->x = (int)p.x;
     pt->y = (int)p.y;
 }
     pt->x = (int)p.x;
     pt->y = (int)p.y;
 }


@@ -579,7 +579,7 @@ void wxWidgetIPhoneImpl::SetScrollThumb( wxInt32 value, wxInt32 thumbSize )
 {
 }
 
 {
 }
 

-void wxWidgetIPhoneImpl::SetControlSize( wxWindowVariant variant ) 
+void wxWidgetIPhoneImpl::SetControlSize( wxWindowVariant variant )

 {
 }
 
 {
 }
 


@@ -634,7 +634,7 @@ void wxWidgetIPhoneImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* ot
 #endif
 
         wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));
 #endif
 
         wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));

-                    
+

         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
         if (otherWindow)
         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
         if (otherWindow)


@@ -650,7 +650,7 @@ bool wxWidgetIPhoneImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     // get the current focus before running becomeFirstResponder

-    UIView* otherView = FindFocus(); 
+    UIView* otherView = FindFocus();

     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )


@@ -665,7 +665,7 @@ bool wxWidgetIPhoneImpl::resignFirstResponder(WXWidget slf, void *_cmd)
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
     // get the current focus after running resignFirstResponder
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
     // get the current focus after running resignFirstResponder

-    UIView* otherView = FindFocus(); 
+    UIView* otherView = FindFocus();

     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     // NSTextViews have an editor as true responder, therefore the might get the
     // resign notification if their editor takes over, don't trigger any event hen
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     // NSTextViews have an editor as true responder, therefore the might get the
     // resign notification if their editor takes over, don't trigger any event hen


@@ -681,13 +681,13 @@ void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cm
     CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
     CGContextSaveGState( context );
     // draw background
     CGContextRef context = (CGContextRef) UIGraphicsGetCurrentContext();
     CGContextSaveGState( context );
     // draw background

-    
+

     CGContextSetFillColorWithColor( context, GetWXPeer()->GetBackgroundColour().GetCGColor());
     CGContextFillRect(context, *rect );
 
     GetWXPeer()->MacSetCGContextRef( context );
 
     CGContextSetFillColorWithColor( context, GetWXPeer()->GetBackgroundColour().GetCGColor());
     CGContextFillRect(context, *rect );
 
     GetWXPeer()->MacSetCGContextRef( context );
 

-    GetWXPeer()->GetUpdateRegion() = 
+    GetWXPeer()->GetUpdateRegion() =

         wxRegion(rect->origin.x,rect->origin.y,rect->size.width,rect->size.height) ;
 
     wxRegion updateRgn( wxFromNSRect( slf, *rect ) );
         wxRegion(rect->origin.x,rect->origin.y,rect->size.width,rect->size.height) ;
 
     wxRegion updateRgn( wxFromNSRect( slf, *rect ) );


@@ -695,9 +695,9 @@ void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cm
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );
     wxWindow* wxpeer = GetWXPeer();
     wxpeer->GetUpdateRegion() = updateRgn;
     wxpeer->MacSetCGContextRef( context );

-    
+

     bool handled = wxpeer->MacDoRedraw( 0 );
     bool handled = wxpeer->MacDoRedraw( 0 );

-            
+

     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );
     CGContextRestoreGState( context );
 
     CGContextSaveGState( context );


@@ -718,7 +718,7 @@ void wxWidgetIPhoneImpl::drawRect(CGRect* rect, WXWidget slf, void *WXUNUSED(_cm
 
 void wxWidgetIPhoneImpl::touchEvent(NSSet* touches, UIEvent *event, WXWidget slf, void *WXUNUSED(_cmd))
 {
 
 void wxWidgetIPhoneImpl::touchEvent(NSSet* touches, UIEvent *event, WXWidget slf, void *WXUNUSED(_cmd))
 {

-    CGPoint clickLocation; 
+    CGPoint clickLocation;

     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:slf];
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
     UITouch *touch = [touches anyObject];
     clickLocation = [touch locationInView:slf];
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );


@@ -741,12 +741,12 @@ void wxWidgetIPhoneImpl::touchUpInsideAction(void* sender, WX_UIEvent evt, WXWid
 // Factory methods
 //
 
 // Factory methods
 //
 

-wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), 
+wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent),

     wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
     long WXUNUSED(style), long WXUNUSED(extraStyle))
 {
     UIView* sv = (wxpeer->GetParent()->GetHandle() );
     wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
     long WXUNUSED(style), long WXUNUSED(extraStyle))
 {
     UIView* sv = (wxpeer->GetParent()->GetHandle() );

-    
+

     CGRect r = CGRectMake( pos.x, pos.y, size.x, size.y) ;
     // Rect bounds = wxMacGetBoundsForControl( wxpeer, pos , size ) ;
     wxUIView* v = [[wxUIView alloc] initWithFrame:r];
     CGRect r = CGRectMake( pos.x, pos.y, size.x, size.y) ;
     // Rect bounds = wxMacGetBoundsForControl( wxpeer, pos , size ) ;
     wxUIView* v = [[wxUIView alloc] initWithFrame:r];


@@ -757,7 +757,7 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WX
     return c;
 }
 
     return c;
 }
 

-wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) 
+wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )

 {
     UIWindow* toplevelwindow = now->GetWXWindow();
 
 {
     UIWindow* toplevelwindow = now->GetWXWindow();
 


@@ -768,18 +768,18 @@ wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
     /*
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
     // left orientation not yet implemented !
     /*
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
     // left orientation not yet implemented !

-    if (orientation == UIInterfaceOrientationLandscapeRight ) 
+    if (orientation == UIInterfaceOrientationLandscapeRight )

     {
         CGAffineTransform transform = v.transform;
     {
         CGAffineTransform transform = v.transform;

- 
+

         // Use the status bar frame to determine the center point of the window's content area.
         CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
         CGRect bounds = CGRectMake(0, 0, statusBarFrame.size.height, statusBarFrame.origin.x);
         CGPoint center = CGPointMake(bounds.size.height / 2.0, bounds.size.width / 2.0);
         // Use the status bar frame to determine the center point of the window's content area.
         CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
         CGRect bounds = CGRectMake(0, 0, statusBarFrame.size.height, statusBarFrame.origin.x);
         CGPoint center = CGPointMake(bounds.size.height / 2.0, bounds.size.width / 2.0);

- 
+

         // Set the center point of the view to the center point of the window's content area.
         v.center = center;
         // Set the center point of the view to the center point of the window's content area.
         v.center = center;

- 
+

         // Rotate the view 90 degrees around its new center point.
         transform = CGAffineTransformRotate(transform, ( M_PI / 2.0));
         v.transform = transform;
         // Rotate the view 90 degrees around its new center point.
         transform = CGAffineTransformRotate(transform, ( M_PI / 2.0));
         v.transform = transform;

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 43d0bdb331b1b14f06dddc6c09953113591dca9e..25a06fd79ede7a1e1eb6cf9167a403e16338a73d 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -88,7 +88,7 @@ bool wxListBox::Create(
         m_strings.unsorted = new wxArrayString;
 
     m_peer = wxWidgetImpl::CreateListBox( this, parent, id, pos, size, style, GetExtraStyle() );
         m_strings.unsorted = new wxArrayString;
 
     m_peer = wxWidgetImpl::CreateListBox( this, parent, id, pos, size, style, GetExtraStyle() );

-    
+

     MacPostControlCreate( pos, size );
 
     m_textColumn = GetListPeer()->InsertTextColumn(0,wxEmptyString);
     MacPostControlCreate( pos, size );
 
     m_textColumn = GetListPeer()->InsertTextColumn(0,wxEmptyString);


@@ -155,7 +155,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
 
     GetListPeer()->ListDelete( n );
     m_blockEvents = false;
 
     GetListPeer()->ListDelete( n );
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -164,7 +164,7 @@ void wxListBox::DoClear()
     m_blockEvents = true;
     FreeData();
     m_blockEvents = false;
     m_blockEvents = true;
     FreeData();
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -178,14 +178,14 @@ void wxListBox::DoSetSelection(int n, bool select)
         wxT("invalid index in wxListBox::SetSelection") );
 
     m_blockEvents = true;
         wxT("invalid index in wxListBox::SetSelection") );
 
     m_blockEvents = true;

-    
+

     if ( n == wxNOT_FOUND )
         GetListPeer()->ListDeselectAll();
     else
         GetListPeer()->ListSetSelection( n, select, HasMultipleSelection() );
     if ( n == wxNOT_FOUND )
         GetListPeer()->ListDeselectAll();
     else
         GetListPeer()->ListSetSelection( n, select, HasMultipleSelection() );

-        
+

     m_blockEvents = false;
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -375,7 +375,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
 
 void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 {
 
 void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 {

-    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED : 
+    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED :

         wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )
         wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )


@@ -390,7 +390,7 @@ void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 
 //
 // common list cell value operations
 
 //
 // common list cell value operations

-// 
+//

 
 void wxListWidgetCellValue::Check( bool check )
 {
 
 void wxListWidgetCellValue::Check( bool check )
 {


@@ -401,7 +401,7 @@ bool wxListWidgetCellValue::IsChecked() const
 {
     return GetIntValue() != 0;
 }
 {
     return GetIntValue() != 0;
 }

-    
+

 
 
 #endif // wxUSE_LISTBOX
 
 
 #endif // wxUSE_LISTBOX

diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index 3ba608e8a620fe242c9cb4e1ae381bb04d5a4325..4825f1834028058721d8292af36e6788e0b8dbca 100644 (file)
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -76,7 +76,7 @@ void wxMenu::Init()
     m_startRadioGroup = -1;
     m_allowRearrange = true;
     m_noEventsMode = false;
     m_startRadioGroup = -1;
     m_allowRearrange = true;
     m_noEventsMode = false;

-    
+

     m_peer = wxMenuImpl::Create( this, wxStripMenuCodes(m_title) );
 
 
     m_peer = wxMenuImpl::Create( this, wxStripMenuCodes(m_title) );
 
 


@@ -144,7 +144,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
             pSubMenu->DoRearrange();
         }
         else
             pSubMenu->DoRearrange();
         }
         else

-        { 
+        {

             if ( pItem->GetId() == idMenuTitle )
                 pItem->GetMenu()->Enable( idMenuTitle, false );
         }
             if ( pItem->GetId() == idMenuTitle )
                 pItem->GetMenu()->Enable( idMenuTitle, false );
         }


@@ -293,7 +293,7 @@ void wxMenu::DoRearrange()
 {
     if ( !AllowRearrange() )
         return;
 {
     if ( !AllowRearrange() )
         return;

-        
+

     wxMenuItem* previousItem = NULL ;
     size_t pos ;
     wxMenuItemList::compatibility_iterator node;
     wxMenuItem* previousItem = NULL ;
     size_t pos ;
     wxMenuItemList::compatibility_iterator node;


@@ -564,7 +564,7 @@ void wxMenuBar::MacInstallMenuBar()
 {
     if ( s_macInstalledMenuBar == this )
         return ;
 {
     if ( s_macInstalledMenuBar == this )
         return ;

-        
+

     m_rootMenu->GetPeer()->MakeRoot();
     // DisableMenuCommand( NULL , kHICommandPreferences ) ;
 #if 0
     m_rootMenu->GetPeer()->MakeRoot();
     // DisableMenuCommand( NULL , kHICommandPreferences ) ;
 #if 0


@@ -765,7 +765,7 @@ void wxMenuBar::MacInstallMenuBar()
 void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
     wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
 void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
     wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );

-    
+

     m_rootMenu->FindItemByPosition( pos )->Enable(enable);
 
     Refresh();
     m_rootMenu->FindItemByPosition( pos )->Enable(enable);
 
     Refresh();


@@ -847,7 +847,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         return false;
 
     m_titles.Insert(title, pos);
         return false;
 
     m_titles.Insert(title, pos);

-    
+

     m_rootMenu->Insert( pos+firstMenuPos, wxMenuItem::New( m_rootMenu, wxID_ANY, title, "", wxITEM_NORMAL, menu ) );
 
     if (m_invokingWindow)
     m_rootMenu->Insert( pos+firstMenuPos, wxMenuItem::New( m_rootMenu, wxID_ANY, title, "", wxITEM_NORMAL, menu ) );
 
     if (m_invokingWindow)


@@ -942,7 +942,7 @@ void wxMenuBar::SetInvokingWindow(wxFrame *frame)
 {
     m_invokingWindow = frame;
     wxMenubarSetInvokingWindow(m_appleMenu, frame);
 {
     m_invokingWindow = frame;
     wxMenubarSetInvokingWindow(m_appleMenu, frame);

-    
+

     wxMenu *menu;
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
 
     wxMenu *menu;
     wxMenuList::compatibility_iterator node = m_menus.GetFirst();
 

diff --git a/src/osx/menuitem_osx.cpp b/src/osx/menuitem_osx.cpp
index 657e3d2447073997c91206f9462cd595baa0c2fb..cff6e59777b477fc0bf432b5e652d6f2b34c181a 100644 (file)
--- a/src/osx/menuitem_osx.cpp
+++ b/src/osx/menuitem_osx.cpp
@@ -48,14 +48,14 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
 
     m_radioGroup.start = -1;
     m_isRadioGroupStart = false;
 
     m_radioGroup.start = -1;
     m_isRadioGroupStart = false;

-    
+

     wxString text = wxStripMenuCodes(m_text);
     if (text.IsEmpty() && !IsSeparator())
     {
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
         text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }
     wxString text = wxStripMenuCodes(m_text);
     if (text.IsEmpty() && !IsSeparator())
     {
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
         text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }

-    
+

     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
     // use accessors for ID and Kind because they might have been changed in the base constructor
     m_peer = wxMenuItemImpl::Create( this, pParentMenu, GetId(), text, entry, strHelp, GetKind(), pSubMenu );
     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
     // use accessors for ID and Kind because they might have been changed in the base constructor
     m_peer = wxMenuItemImpl::Create( this, pParentMenu, GetId(), text, entry, strHelp, GetKind(), pSubMenu );


@@ -83,7 +83,7 @@ void wxMenuItem::Enable(bool bDoEnable)
       // eg. BeginAppModalStateForWindow() will disable menus and ignore this change
       // which in turn causes m_isEnabled to become out of sync with real menuitem state
 #if wxOSX_USE_CARBON
       // eg. BeginAppModalStateForWindow() will disable menus and ignore this change
       // which in turn causes m_isEnabled to become out of sync with real menuitem state
 #if wxOSX_USE_CARBON

-         && !(m_parentMenu && !IsMenuItemEnabled(MAC_WXHMENU(m_parentMenu->GetHMenu()), 0)) 
+         && !(m_parentMenu && !IsMenuItemEnabled(MAC_WXHMENU(m_parentMenu->GetHMenu()), 0))

 #endif
          )
       // always update builtin menuitems
 #endif
          )
       // always update builtin menuitems


@@ -176,7 +176,7 @@ void wxMenuItem::UpdateItemBitmap()
 {
     if ( !m_parentMenu )
         return;
 {
     if ( !m_parentMenu )
         return;

-    
+

     if ( m_bitmap.Ok() )
     {
         m_peer->SetBitmap( m_bitmap );
     if ( m_bitmap.Ok() )
     {
         m_peer->SetBitmap( m_bitmap );


@@ -190,12 +190,12 @@ void wxMenuItem::UpdateItemStatus()
 
     if ( IsSeparator() )
         return ;
 
     if ( IsSeparator() )
         return ;

-        
+

     if ( IsCheckable() && IsChecked() )
         m_peer->Check( true );
     else
         m_peer->Check( false );
     if ( IsCheckable() && IsChecked() )
         m_peer->Check( true );
     else
         m_peer->Check( false );

-        
+

     m_peer->Enable( IsEnabled() );
 }
 
     m_peer->Enable( IsEnabled() );
 }
 


@@ -210,7 +210,7 @@ void wxMenuItem::UpdateItemText()
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
         text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
         text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }

-    
+

     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
     m_peer->SetLabel( text, entry );
     delete entry ;
     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
     m_peer->SetLabel( text, entry );
     delete entry ;

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index c2f36dd487b409e6d6aeeda64cf1bd11b2b9f704..7b8f08cedd59ace147a2ba038d9ccf585199f046 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -153,11 +153,11 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
     SendDestroyEvent();
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
     SendDestroyEvent();

-    
+

     wxRemoveWXWindowAssociation( this ) ;
     wxRemoveWXWindowAssociation( this ) ;

-    
+

     DestroyChildren();
     DestroyChildren();

-    
+

     delete m_nowpeer;
 
     // avoid dangling refs
     delete m_nowpeer;
 
     // avoid dangling refs


@@ -171,7 +171,7 @@ wxNonOwnedWindow::~wxNonOwnedWindow()
 
 bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
                                 unsigned timeout )
 
 bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
                                 unsigned timeout )

-{ 
+{

     if ( !wxWindow::Show(true) )
         return false;
 
     if ( !wxWindow::Show(true) )
         return false;
 


@@ -181,16 +181,16 @@ bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
     HandleWindowEvent(event);
 
 
     HandleWindowEvent(event);
 
 

-    return m_nowpeer->ShowWithEffect(true, effect, timeout); 
+    return m_nowpeer->ShowWithEffect(true, effect, timeout);

 }
 
 bool wxNonOwnedWindow::HideWithEffect(wxShowEffect effect,
                                 unsigned timeout )
 }
 
 bool wxNonOwnedWindow::HideWithEffect(wxShowEffect effect,
                                 unsigned timeout )

-{ 
+{

     if ( !wxWindow::Show(false) )
         return false;
 
     if ( !wxWindow::Show(false) )
         return false;
 

-    return m_nowpeer->ShowWithEffect(false, effect, timeout); 
+    return m_nowpeer->ShowWithEffect(false, effect, timeout);

 }
 
 wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
 }
 
 wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const


@@ -201,17 +201,17 @@ wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
 }
 
 bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )
 }
 
 bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )

-{        
+{

     if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
         return false ;
     if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
         return false ;

-    
+

     if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
     {
         if ( m_nowpeer )
             return m_nowpeer->SetBackgroundColour(c);
     }
     return true;
     if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
     {
         if ( m_nowpeer )
             return m_nowpeer->SetBackgroundColour(c);
     }
     return true;

-}    
+}

 
 // Raise the window to the top of the Z order
 void wxNonOwnedWindow::Raise()
 
 // Raise the window to the top of the Z order
 void wxNonOwnedWindow::Raise()


@@ -306,7 +306,7 @@ bool wxNonOwnedWindow::Show(bool show)
 
     if ( m_nowpeer )
         m_nowpeer->Show(show);
 
     if ( m_nowpeer )
         m_nowpeer->Show(show);

-    
+

     if ( show )
     {
         // because apps expect a size event to occur at this moment
     if ( show )
     {
         // because apps expect a size event to occur at this moment


@@ -314,7 +314,7 @@ bool wxNonOwnedWindow::Show(bool show)
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }

-    
+

     return true ;
 }
 
     return true ;
 }
 


@@ -345,7 +345,7 @@ bool wxNonOwnedWindow::SetBackgroundStyle(wxBackgroundStyle style)
 {
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;
 {
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;

-        
+

     return m_nowpeer ? m_nowpeer->SetBackgroundStyle(style) : true;
 }
 
     return m_nowpeer ? m_nowpeer->SetBackgroundStyle(style) : true;
 }
 


@@ -378,9 +378,9 @@ void wxNonOwnedWindow::DoGetSize( int *width, int *height ) const
 {
     if ( m_nowpeer == NULL )
         return;
 {
     if ( m_nowpeer == NULL )
         return;

-        
+

     int w,h;
     int w,h;

-    
+

     m_nowpeer->GetSize(w, h);
 
     if (width)
     m_nowpeer->GetSize(w, h);
 
     if (width)

diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index 0f3c83577e6207caab975aa2fdd4507cdcb69a8b..dad2a6c5c49fb473d23e3dd6fcd1a5d2e3034f9f 100644 (file)
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -82,7 +82,7 @@ bool wxNotebook::Create( wxWindow *parent,
         return false;
 
     m_peer = wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() );
         return false;
 
     m_peer = wxWidgetImpl::CreateTabView(this,parent, id, pos, size, style, GetExtraStyle() );

-    
+

     MacPostControlCreate( pos, size );
 
     return true ;
     MacPostControlCreate( pos, size );
 
     return true ;

diff --git a/src/osx/printdlg_osx.cpp b/src/osx/printdlg_osx.cpp
index 00e7bc39545475adeee06dd5048cea1649acf01f..c0edeccc5642027924c702dff1491fb760ff3898 100644 (file)
--- a/src/osx/printdlg_osx.cpp
+++ b/src/osx/printdlg_osx.cpp
@@ -149,7 +149,7 @@ bool wxMacPageMarginsDialog::TransferToWindow()
   m_LeftMargin->SetFocus();
   return true;
   }
   m_LeftMargin->SetFocus();
   return true;
   }

-  
+

 bool wxMacPageMarginsDialog::TransferDataFromWindow()
   {
   wxPoint topLeft, bottomRight;
 bool wxMacPageMarginsDialog::TransferDataFromWindow()
   {
   wxPoint topLeft, bottomRight;


@@ -161,7 +161,7 @@ bool wxMacPageMarginsDialog::TransferDataFromWindow()
   m_pageSetupDialogData->SetMarginBottomRight(bottomRight);
   return true;
   }
   m_pageSetupDialogData->SetMarginBottomRight(bottomRight);
   return true;
   }

-  
+

 bool wxMacPageMarginsDialog::CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name)
   {
   long lvalue;
 bool wxMacPageMarginsDialog::CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name)
   {
   long lvalue;

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 3b1b220205b9601872fc6b5844e42b2d9595f164..874381292c73f137ec41597c11a3c6e706812f31 100644 (file)
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -407,7 +407,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     wxSize bestSizeRadio ;
     if ( m_radioButtonCycle )
         bestSizeRadio = m_radioButtonCycle->GetBestSize();
     wxSize bestSizeRadio ;
     if ( m_radioButtonCycle )
         bestSizeRadio = m_radioButtonCycle->GetBestSize();

-        
+

     for (unsigned int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );
     for (unsigned int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );


@@ -421,10 +421,10 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)

-    int space = 3; 
+    int space = 3;

     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;
     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;

-        
+

     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 


@@ -480,7 +480,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         current = current->NextInCycle();
 
         if (m_windowStyle & wxRA_SPECIFY_ROWS)
         current = current->NextInCycle();
 
         if (m_windowStyle & wxRA_SPECIFY_ROWS)

-            y_offset += maxHeight + space; 
+            y_offset += maxHeight + space;

         else
             x_offset += maxWidth + charWidth;
     }
         else
             x_offset += maxWidth + charWidth;
     }


@@ -519,10 +519,10 @@ wxSize wxRadioBox::DoGetBestSize() const
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)

-    int space = 3; 
+    int space = 3;

     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;
     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;

-        
+

     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 


@@ -548,7 +548,7 @@ bool wxRadioBox::SetFont(const wxFont& font)
     bool retval = wxWindowBase::SetFont( font );
 
     // dont' update the native control, it has its own small font
     bool retval = wxWindowBase::SetFont( font );
 
     // dont' update the native control, it has its own small font

-    
+

     // should we iterate over the children ?
 
     return retval;
     // should we iterate over the children ?
 
     return retval;

diff --git a/src/osx/radiobut_osx.cpp b/src/osx/radiobut_osx.cpp
index 65ef802052683ed4907447b8473cd2a4449e560d..f1bd3fa49bf6e0d5f58dba49efd97d6cfe1b9a66 100644 (file)
--- a/src/osx/radiobut_osx.cpp
+++ b/src/osx/radiobut_osx.cpp
@@ -160,7 +160,7 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 }
 
 void wxRadioButton::RemoveFromCycle()
 }
 
 void wxRadioButton::RemoveFromCycle()

-{        
+{

     if ((m_cycle == NULL) || (m_cycle == this))
         return;
 
     if ((m_cycle == NULL) || (m_cycle == this))
         return;
 

diff --git a/src/osx/scrolbar_osx.cpp b/src/osx/scrolbar_osx.cpp
index 3a992ca618f18e9b4337060d43f32ba2a621498f..6767de28b68c2c7e7e274a5294dc06365270977b 100644 (file)
--- a/src/osx/scrolbar_osx.cpp
+++ b/src/osx/scrolbar_osx.cpp
@@ -41,7 +41,7 @@ bool wxScrollBar::Create( wxWindow *parent,
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;

-        
+

     m_peer = wxWidgetImpl::CreateScrollBar( this, parent, id, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );
     m_peer = wxWidgetImpl::CreateScrollBar( this, parent, id, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );


@@ -74,7 +74,7 @@ void wxScrollBar::SetScrollbar( int position,
     m_objectSize = range;
 
    int range1 = wxMax( (m_objectSize - m_viewSize), 0 );
     m_objectSize = range;
 
    int range1 = wxMax( (m_objectSize - m_viewSize), 0 );

-   
+

    m_peer->SetMaximum( range1 );
    m_peer->SetScrollThumb( position, m_viewSize );
 }
    m_peer->SetMaximum( range1 );
    m_peer->SetScrollThumb( position, m_viewSize );
 }

diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index 512ff478941511f71cd00762563b24d9a5385f24..cfa7fffc516353576304410d5cc560bd1ac6f6cc 100644 (file)
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -186,9 +186,9 @@ void wxSlider::SetRange(int minValue, int maxValue)
         m_macMaximumStatic->SetLabel( value );
     }
 
         m_macMaximumStatic->SetLabel( value );
     }
 

-    // If the range is out of bounds, set it to a 
+    // If the range is out of bounds, set it to a

     // value that is within bounds
     // value that is within bounds

-    // RN: Testing reveals OSX does its own 
+    // RN: Testing reveals OSX does its own

     // bounding, perhaps this isn't needed?
     int currentValue = GetValue();
 
     // bounding, perhaps this isn't needed?
     int currentValue = GetValue();
 


@@ -299,7 +299,7 @@ void wxSlider::TriggerScrollEvent( wxEventType scrollEvent)
 bool wxSlider::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     TriggerScrollEvent(wxEVT_SCROLL_THUMBRELEASE);
 bool wxSlider::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     TriggerScrollEvent(wxEVT_SCROLL_THUMBRELEASE);

- 
+

     return true;
 }
 
     return true;
 }
 

diff --git a/src/osx/spinbutt_osx.cpp b/src/osx/spinbutt_osx.cpp
index f16fe1e072e85e655f30d19f821ddabbb2ca5b54..d9b99b02b04cc16eb88d0b17ed007df7f26c0dd2 100644 (file)
--- a/src/osx/spinbutt_osx.cpp
+++ b/src/osx/spinbutt_osx.cpp
@@ -40,10 +40,10 @@ bool wxSpinButton::Create( wxWindow *parent,
 
     if (!parent)
         return false;
 
     if (!parent)
         return false;

-    
+

     m_peer = wxWidgetImpl::CreateSpinButton( this , parent, id, 0, m_min, m_max, pos, size,
         style, GetExtraStyle() );
     m_peer = wxWidgetImpl::CreateSpinButton( this , parent, id, 0, m_min, m_max, pos, size,
         style, GetExtraStyle() );

-        
+

     MacPostControlCreate( pos, size );
 
     return true;
     MacPostControlCreate( pos, size );
 
     return true;


@@ -69,9 +69,9 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
     m_max = maxVal;
     m_peer->SetMaximum( maxVal );
     m_peer->SetMinimum( minVal );
     m_max = maxVal;
     m_peer->SetMaximum( maxVal );
     m_peer->SetMinimum( minVal );

-}   
-    
-void wxSpinButton::SendThumbTrackEvent() 
+}
+
+void wxSpinButton::SendThumbTrackEvent()

 {
     wxSpinEvent event( wxEVT_SCROLL_THUMBTRACK, GetId() );
     event.SetPosition( GetValue() );
 {
     wxSpinEvent event( wxEVT_SCROLL_THUMBTRACK, GetId() );
     event.SetPosition( GetValue() );


@@ -94,7 +94,7 @@ void wxSpinButton::TriggerScrollEvent(wxEventType scrollEvent)
 {
     int inc = 0;
 
 {
     int inc = 0;
 

-    if ( scrollEvent == wxEVT_SCROLL_LINEUP )    
+    if ( scrollEvent == wxEVT_SCROLL_LINEUP )

     {
         inc = 1;
     }
     {
         inc = 1;
     }


@@ -102,9 +102,9 @@ void wxSpinButton::TriggerScrollEvent(wxEventType scrollEvent)
     {
         inc = -1;
     }
     {
         inc = -1;
     }

-    
+

     // trigger scroll events
     // trigger scroll events

-    
+

     int oldValue = GetValue() ;
 
     int newValue = oldValue + inc;
     int oldValue = GetValue() ;
 
     int newValue = oldValue + inc;

diff --git a/src/osx/srchctrl_osx.cpp b/src/osx/srchctrl_osx.cpp
index d264955f0063b75475568fc20542c5c3803bdfc1..7881f00e349e94a3cd1a272c2fabb33c02961052 100644 (file)
--- a/src/osx/srchctrl_osx.cpp
+++ b/src/osx/srchctrl_osx.cpp
@@ -70,7 +70,7 @@ wxSearchWidgetImpl* wxSearchCtrl::GetSearchPeer() const
 {
     return dynamic_cast<wxSearchWidgetImpl*> (m_peer);
 }
 {
     return dynamic_cast<wxSearchWidgetImpl*> (m_peer);
 }

- 
+

 wxSearchCtrl::~wxSearchCtrl()
 {
     delete m_menu;
 wxSearchCtrl::~wxSearchCtrl()
 {
     delete m_menu;

diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp
index 7f4d5a80107e1110553d0e5fc8821336f12f728d..11ecc527bd23ac7a3fc284e8d955d8a737d743c7 100644 (file)
--- a/src/osx/statbox_osx.cpp
+++ b/src/osx/statbox_osx.cpp
@@ -32,7 +32,7 @@ bool wxStaticBox::Create( wxWindow *parent,
         return false;
 
     m_labelOrig = m_label = label;
         return false;
 
     m_labelOrig = m_label = label;

-    
+

     m_peer = wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );
     m_peer = wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );

diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 30b871a442b8725bba01d2680e3aa5a0b1f7e1d6..1ff9003570ce5765f794f655d45d705870a02ef6 100644 (file)
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -57,9 +57,9 @@ void wxStaticText::SetLabel(const wxString& label)
     m_labelOrig = label;
 
     // middle/end ellipsization is handled by the OS:
     m_labelOrig = label;
 
     // middle/end ellipsization is handled by the OS:

-    if ( HasFlag(wxST_ELLIPSIZE_END) || HasFlag(wxST_ELLIPSIZE_MIDDLE) 
+    if ( HasFlag(wxST_ELLIPSIZE_END) || HasFlag(wxST_ELLIPSIZE_MIDDLE)

 #if wxOSX_USE_COCOA // Cocoa has all three modes
 #if wxOSX_USE_COCOA // Cocoa has all three modes

-         || HasFlag(wxST_ELLIPSIZE_START) 
+         || HasFlag(wxST_ELLIPSIZE_START)

 #endif
     )
     {
 #endif
     )
     {

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 86de81f539285f31b8c4b5f1e4aa857c40f0915b..29546c39cbb31ce414f725e474eedcdf9f7b1d1c 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -134,7 +134,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
 wxTextWidgetImpl* wxTextCtrl::GetTextPeer() const
 {
 
 wxTextWidgetImpl* wxTextCtrl::GetTextPeer() const
 {

-    return dynamic_cast<wxTextWidgetImpl*> (m_peer); 
+    return dynamic_cast<wxTextWidgetImpl*> (m_peer);

 }
 
 void wxTextCtrl::MacSuperChangedPosition()
 }
 
 void wxTextCtrl::MacSuperChangedPosition()


@@ -486,7 +486,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     // allow navigation and deletion
     GetSelection( &from, &to );
     if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&
     // allow navigation and deletion
     GetSelection( &from, &to );
     if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&

-        key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB && key != WXK_UP && key != WXK_DOWN && 
+        key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB && key != WXK_UP && key != WXK_DOWN &&

         key != WXK_BACK && key != WXK_DELETE && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) ) &&
         from == to )
     {
         key != WXK_BACK && key != WXK_DELETE && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) ) &&
         from == to )
     {

diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index 64997c2d738e49b8f60784f6936b1127d1b986b2..a6ec6791411b4930a4953a9329bccd9c1b749fa0 100644 (file)
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/tglbtn.h"
 #include "wx/osx/private.h"
 
 #include "wx/tglbtn.h"
 #include "wx/osx/private.h"

-#include "wx/bmpbuttn.h"       // for wxDEFAULT_BUTTON_MARGIN
+#include "wx/bmpbuttn.h"    // for wxDEFAULT_BUTTON_MARGIN

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -48,26 +48,26 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxString& name)
 {
     m_macIsUserPane = FALSE ;
                             const wxString& name)
 {
     m_macIsUserPane = FALSE ;

-    
+

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;

-    
+

     m_labelOrig = m_label = label ;
 
     m_peer = wxWidgetImpl::CreateToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
 
     MacPostControlCreate(pos,size) ;
     m_labelOrig = m_label = label ;
 
     m_peer = wxWidgetImpl::CreateToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
 
     MacPostControlCreate(pos,size) ;

-    
+

   return TRUE;
 }
 
 wxSize wxToggleButton::DoGetBestSize() const
 {
   return TRUE;
 }
 
 wxSize wxToggleButton::DoGetBestSize() const
 {

-    int wBtn = 70 ; 
+    int wBtn = 70 ;

     int hBtn = 20 ;
 
     int lBtn = m_label.Length() * 8 + 12 ;
     int hBtn = 20 ;
 
     int lBtn = m_label.Length() * 8 + 12 ;

-    if (lBtn > wBtn) 
+    if (lBtn > wBtn)

         wBtn = lBtn;
 
     return wxSize ( wBtn , hBtn ) ;
         wBtn = lBtn;
 
     return wxSize ( wBtn , hBtn ) ;


@@ -89,7 +89,7 @@ void wxToggleButton::Command(wxCommandEvent & event)
    ProcessCommand(event);
 }
 
    ProcessCommand(event);
 }
 

-bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) 
+bool wxToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());
 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());


@@ -112,19 +112,19 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxString& name)
 {
     m_macIsUserPane = FALSE ;
                             const wxString& name)
 {
     m_macIsUserPane = FALSE ;

-    
+

     m_bitmap = label;
     m_bitmap = label;

-    
+

     m_marginX =
     m_marginY = wxDEFAULT_BUTTON_MARGIN;
     m_marginX =
     m_marginY = wxDEFAULT_BUTTON_MARGIN;

-    
+

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;

-        
+

     m_peer = wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
 
     MacPostControlCreate(pos,size) ;
     m_peer = wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
 
     MacPostControlCreate(pos,size) ;

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -156,7 +156,7 @@ void wxBitmapToggleButton::Command(wxCommandEvent & event)
    ProcessCommand(event);
 }
 
    ProcessCommand(event);
 }
 

-bool wxBitmapToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) 
+bool wxBitmapToggleButton::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());
 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 42c94ae66048d011bb973f4c18d3271dd01b30cf..4a4c1278a9e68a5015285a55102aace5d9333aa9 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -244,7 +244,7 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them

-    if ( (! IsKindOf(CLASSINFO(wxControl)) 
+    if ( (! IsKindOf(CLASSINFO(wxControl))

 #if wxUSE_STATUSBAR
         && ! IsKindOf(CLASSINFO(wxStatusBar))
 #endif
 #if wxUSE_STATUSBAR
         && ! IsKindOf(CLASSINFO(wxStatusBar))
 #endif


@@ -898,7 +898,7 @@ wxSize wxWindowMac::DoGetBestSize() const
             r.width =
             r.height = 16 ;
 
             r.width =
             r.height = 16 ;
 

-            if ( 0 ) 
+            if ( 0 )

             {
             }
 #if wxUSE_SCROLLBAR
             {
             }
 #if wxUSE_SCROLLBAR

diff --git a/src/palmos/dcmemory.cpp b/src/palmos/dcmemory.cpp
index ebe91b08fcdb490310e379e229697a8d9f37639b..13bf45b0c22b21d7b1a25749a8fbc2b1c4695ec3 100644 (file)
--- a/src/palmos/dcmemory.cpp
+++ b/src/palmos/dcmemory.cpp
@@ -38,23 +38,23 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPalmDCImpl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPalmDCImpl)
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )

         : wxPalmDCImpl( owner )
 {
         : wxPalmDCImpl( owner )
 {

-    CreateCompatible(NULL); 
-    Init(); 
+    CreateCompatible(NULL);
+    Init();

 }
 
 }
 

-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) 
-        : wxPalmDCImpl( owner ) 
-{ 
-    CreateCompatible(NULL); 
-    Init(); 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+        : wxPalmDCImpl( owner )
+{
+    CreateCompatible(NULL);
+    Init();

     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )
     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )

-        : wxPalmDCImpl( owner ) 
+        : wxPalmDCImpl( owner )

 {
     wxCHECK_RET( dc, wxT("NULL dc in wxMemoryDC ctor") );
 
 {
     wxCHECK_RET( dc, wxT("NULL dc in wxMemoryDC ctor") );
 

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index c8d50cd201d916d9732d12c65767eaaa0b770492..c4444d6de3ed96e98a10c49e2de20ea3ab39aaf0 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -1258,19 +1258,19 @@ bool wxSystemColourProperty::OnEvent( wxPropertyGrid* propgrid,
     }
     else if ( event.GetEventType() == wxEVT_COMMAND_COMBOBOX_SELECTED )
     {
     }
     else if ( event.GetEventType() == wxEVT_COMMAND_COMBOBOX_SELECTED )
     {

-               // Must override index detection since at this point GetIndex()
-               // will return old value.
-               wxOwnerDrawnComboBox* cb =
-                       static_cast<wxOwnerDrawnComboBox*>(propgrid->GetEditorControl());
-
-               if ( cb )
-               {
-                       int index = cb->GetSelection();
-
-                       if ( index == GetCustomColourIndex() &&
-                                !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
-                               askColour = true;
-               }
+        // Must override index detection since at this point GetIndex()
+        // will return old value.
+        wxOwnerDrawnComboBox* cb =
+            static_cast<wxOwnerDrawnComboBox*>(propgrid->GetEditorControl());
+
+        if ( cb )
+        {
+            int index = cb->GetSelection();
+
+            if ( index == GetCustomColourIndex() &&
+                    !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
+                askColour = true;
+        }

     }
 
     if ( askColour && !propgrid->WasValueChangedInEvent() )
     }
 
     if ( askColour && !propgrid->WasValueChangedInEvent() )

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index dfc6fdf8172d6c53715be351d1236e31a6a09264..6109df5f0d7676ec2eecf10011a1e700edb8a85e 100644 (file)
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -71,7 +71,7 @@
     #define wxPG_TEXTCTRL_AND_BUTTON_SPACING        4
 #else
     #define wxPG_TEXTCTRL_AND_BUTTON_SPACING        2
     #define wxPG_TEXTCTRL_AND_BUTTON_SPACING        4
 #else
     #define wxPG_TEXTCTRL_AND_BUTTON_SPACING        2

-#endif 
+#endif

 
 #define wxPG_BUTTON_SIZEDEC                         0
 
 
 #define wxPG_BUTTON_SIZEDEC                         0
 


@@ -144,7 +144,7 @@
 // for odcombo
 #ifdef __WXMAC__
 #define wxPG_CHOICEXADJUST           -3 // required because wxComboCtrl reserves 3pixels for wxTextCtrl's focus ring
 // for odcombo
 #ifdef __WXMAC__
 #define wxPG_CHOICEXADJUST           -3 // required because wxComboCtrl reserves 3pixels for wxTextCtrl's focus ring

-#define wxPG_CHOICEYADJUST           -3 
+#define wxPG_CHOICEYADJUST           -3

 #else
 #define wxPG_CHOICEXADJUST           0
 #define wxPG_CHOICEYADJUST           0
 #else
 #define wxPG_CHOICEXADJUST           0
 #define wxPG_CHOICEYADJUST           0


@@ -966,7 +966,7 @@ bool wxPGChoiceEditor::OnEvent( wxPropertyGrid* propGrid, wxPGProperty* property
                 return false;
             }
         }
                 return false;
             }
         }

-        return wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb, cmnValIndex );        
+        return wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb, cmnValIndex );

     }
     return false;
 }
     }
     return false;
 }


@@ -1413,7 +1413,7 @@ wxPGWindowList wxPGCheckBoxEditor::CreateControls( wxPropertyGrid* propGrid,
                     cb->m_state |= wxSCB_STATE_CHECKED;
 
                 // Makes sure wxPG_EVT_CHANGING etc. is sent for this initial
                     cb->m_state |= wxSCB_STATE_CHECKED;
 
                 // Makes sure wxPG_EVT_CHANGING etc. is sent for this initial

-                // click 
+                // click

                 propGrid->ChangePropertyValue(property,
                                               wxPGVariant_Bool(cb->m_state));
             }
                 propGrid->ChangePropertyValue(property,
                                               wxPGVariant_Bool(cb->m_state));
             }


@@ -1576,7 +1576,7 @@ void wxPropertyGrid::CorrectEditorWidgetPosY()
     if ( m_selColumn == -1 )
         return;
 
     if ( m_selColumn == -1 )
         return;
 

-    if ( GetSelection() && (m_wndEditor || m_wndEditor2) ) 
+    if ( GetSelection() && (m_wndEditor || m_wndEditor2) )

     {
         wxRect r = GetEditorWidgetRect(GetSelection(), m_selColumn);
 
     {
         wxRect r = GetEditorWidgetRect(GetSelection(), m_selColumn);
 


@@ -1678,7 +1678,7 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos,
 #endif
     SetupTextCtrlValue(value);
     tc->Create(ctrlParent,id,value, p, s,tcFlags);
 #endif
     SetupTextCtrlValue(value);
     tc->Create(ctrlParent,id,value, p, s,tcFlags);

-    
+

     // Center the control vertically
     if ( !hasSpecialSize )
         FixPosForTextCtrl(tc);
     // Center the control vertically
     if ( !hasSpecialSize )
         FixPosForTextCtrl(tc);


@@ -1726,7 +1726,7 @@ wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize
    p.x = pos.x + sz.x - but->GetSize().x - 2;
    but->Move(p);
 
    p.x = pos.x + sz.x - but->GetSize().x - 2;
    but->Move(p);
 

-#else 
+#else

     wxSize s(sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2),
         sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2));
 
     wxSize s(sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2),
         sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2));
 

diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 735f18fc75b822aa41c26db962d817d9440e7dcc..158cc557ab61b6ab5d7e1e0da1d1c74b03d03231 100644 (file)
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -726,10 +726,10 @@ void wxPropertyGridManager::SetColumnCount( int colCount, int page )
 
 size_t wxPropertyGridManager::GetPageCount() const
 {
 
 size_t wxPropertyGridManager::GetPageCount() const
 {

-       if ( !(m_iFlags & wxPG_MAN_FL_PAGE_INSERTED) )
-               return 0;
+    if ( !(m_iFlags & wxPG_MAN_FL_PAGE_INSERTED) )
+        return 0;

 
 

-       return m_arrPages.size();
+    return m_arrPages.size();

 }
 
 // -----------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 4f38e08d6bb5d6d7d877cda7bae3d2f482bd23eb..afb45d3fa6ecaf05a09583b7f43cf26cc44b9906 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -108,7 +108,7 @@ void wxPGCellRenderer::DrawEditorValue( wxDC& dc, const wxRect& rect,
 
     if ( editor )
     {
 
     if ( editor )
     {

-        wxRect rect2(rect); 
+        wxRect rect2(rect);

         rect2.x += xOffset;
         rect2.y += yOffset;
         rect2.height -= yOffset;
         rect2.x += xOffset;
         rect2.y += yOffset;
         rect2.height -= yOffset;


@@ -721,7 +721,7 @@ void wxPGProperty::GetDisplayInfo( unsigned int column,
 /*
 wxString wxPGProperty::GetColumnText( unsigned int col, int choiceIndex ) const
 {
 /*
 wxString wxPGProperty::GetColumnText( unsigned int col, int choiceIndex ) const
 {

-    
+

     if ( col != 1 || choiceIndex == wxNOT_FOUND )
     {
         const wxPGCell& cell = GetCell(col);
     if ( col != 1 || choiceIndex == wxNOT_FOUND )
     {
         const wxPGCell& cell = GetCell(col);


@@ -827,7 +827,7 @@ void wxPGProperty::DoGenerateComposedValue( wxString& text,
                                             argFlags|wxPG_COMPOSITE_FRAGMENT);
             }
         }
                                             argFlags|wxPG_COMPOSITE_FRAGMENT);
             }
         }

- 
+

         if ( childResults && curChild->GetChildCount() )
             (*childResults)[curChild->GetName()] = s;
 
         if ( childResults && curChild->GetChildCount() )
             (*childResults)[curChild->GetName()] = s;
 


@@ -2578,14 +2578,14 @@ int wxPropertyCategory::GetTextExtent( const wxWindow* wnd, const wxFont& font )
     if ( m_textExtent > 0 )
         return m_textExtent;
     int x = 0, y = 0;
     if ( m_textExtent > 0 )
         return m_textExtent;
     int x = 0, y = 0;

-       ((wxWindow*)wnd)->GetTextExtent( m_label, &x, &y, 0, 0, &font );
+    ((wxWindow*)wnd)->GetTextExtent( m_label, &x, &y, 0, 0, &font );

     return x;
 }
 
 void wxPropertyCategory::CalculateTextExtent( wxWindow* wnd, const wxFont& font )
 {
     int x = 0, y = 0;
     return x;
 }
 
 void wxPropertyCategory::CalculateTextExtent( wxWindow* wnd, const wxFont& font )
 {
     int x = 0, y = 0;

-       wnd->GetTextExtent( m_label, &x, &y, 0, 0, &font );
+    wnd->GetTextExtent( m_label, &x, &y, 0, 0, &font );

     m_textExtent = x;
 }
 
     m_textExtent = x;
 }
 

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index bedca1688b58a6ef376c06d3998c9f75170b0bc0..4f0fe084554eb9e439ecc0dd49958f168aaf8ffc 100644 (file)
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3819,7 +3819,7 @@ bool wxPropertyGrid::UnfocusEditor()
 void wxPropertyGrid::RefreshEditor()
 {
     wxPGProperty* p = GetSelection();
 void wxPropertyGrid::RefreshEditor()
 {
     wxPGProperty* p = GetSelection();

-    if ( !p ) 
+    if ( !p )

         return;
 
     wxWindow* wnd = GetEditorControl();
         return;
 
     wxWindow* wnd = GetEditorControl();

diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp
index a1c037756d95a37bb93e7a7ecb65b0a601ddf95f..c0e9b5e46ea945c844ee4d0a7f34c0786475ace8 100644 (file)
--- a/src/propgrid/propgridiface.cpp
+++ b/src/propgrid/propgridiface.cpp
@@ -102,7 +102,7 @@ void wxPropertyGridInterface::RefreshGrid( wxPropertyGridPageState* state )
 wxPGProperty* wxPropertyGridInterface::Append( wxPGProperty* property )
 {
     wxPGProperty* retp = m_pState->DoAppend(property);
 wxPGProperty* wxPropertyGridInterface::Append( wxPGProperty* property )
 {
     wxPGProperty* retp = m_pState->DoAppend(property);

-    
+

     wxPropertyGrid* grid = m_pState->GetGrid();
     if ( grid )
         grid->RefreshGrid();
     wxPropertyGrid* grid = m_pState->GetGrid();
     if ( grid )
         grid->RefreshGrid();


@@ -860,7 +860,7 @@ wxString wxPropertyGridInterface::SaveEditableState( int includedStates ) const
         if ( includedStates & ExpandedState )
         {
             wxArrayPGProperty ptrs;
         if ( includedStates & ExpandedState )
         {
             wxArrayPGProperty ptrs;

-            wxPropertyGridConstIterator it = 
+            wxPropertyGridConstIterator it =

                 wxPropertyGridConstIterator( pageState,
                                              wxPG_ITERATE_ALL_PARENTS_RECURSIVELY|wxPG_ITERATE_HIDDEN,
                                              wxNullProperty );
                 wxPropertyGridConstIterator( pageState,
                                              wxPG_ITERATE_ALL_PARENTS_RECURSIVELY|wxPG_ITERATE_HIDDEN,
                                              wxNullProperty );


@@ -964,7 +964,7 @@ bool wxPropertyGridInterface::RestoreEditableState( const wxString& src, int res
                 {
                     if ( restoreStates & ExpandedState )
                     {
                 {
                     if ( restoreStates & ExpandedState )
                     {

-                        wxPropertyGridIterator it = 
+                        wxPropertyGridIterator it =

                             wxPropertyGridIterator( pageState,
                                                     wxPG_ITERATE_ALL,
                                                     wxNullProperty );
                             wxPropertyGridIterator( pageState,
                                                     wxPG_ITERATE_ALL,
                                                     wxNullProperty );

diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index 319878350bd56ce280cbc957502ff06a2ad7bc54..9cb00a145a7b80bbf89c35a354a52ff71c1e8c2a 100644 (file)
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -1771,7 +1771,7 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
 
     wxASSERT( item->GetParentState() == this );
 
 
     wxASSERT( item->GetParentState() == this );
 

-       wxPropertyGrid* pg = GetGrid();
+    wxPropertyGrid* pg = GetGrid();

 
     if ( DoIsPropertySelected(item) )
     {
 
     if ( DoIsPropertySelected(item) )
     {


@@ -1853,13 +1853,13 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
         }
     }
 
         }
     }
 

-    if ( item->GetBaseName().length() && 
+    if ( item->GetBaseName().length() &&

          (parent->IsCategory() || parent->IsRoot()) )
         m_dictName.erase(item->GetBaseName());
 
          (parent->IsCategory() || parent->IsRoot()) )
         m_dictName.erase(item->GetBaseName());
 

-       // We need to clear parent grid's m_propHover, if it matches item
-       if ( pg && pg->m_propHover == item )
-               pg->m_propHover = NULL;
+    // We need to clear parent grid's m_propHover, if it matches item
+    if ( pg && pg->m_propHover == item )
+        pg->m_propHover = NULL;

 
     // We can actually delete it now
     if ( doDelete )
 
     // We can actually delete it now
     if ( doDelete )

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index f0c95395fb08c5a2252637487d9f5203c1d3d19f..0fb0e23b445183ea2a4aff5a14635711d43396a2 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -171,8 +171,8 @@ wxString wxIntProperty::ValueToString( wxVariant& value,
     }
     else if ( value.GetType() == wxPG_VARIANT_TYPE_LONGLONG )
     {
     }
     else if ( value.GetType() == wxPG_VARIANT_TYPE_LONGLONG )
     {

-           wxLongLong ll = value.GetLongLong();
-           return ll.ToString();
+        wxLongLong ll = value.GetLongLong();
+        return ll.ToString();

     }
 
     return wxEmptyString;
     }
 
     return wxEmptyString;

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 6601fa34ad70fe447a0682d990aefb33e43309e5..4e00843d4bab8e7204866d6cc93042b36c8ff86a 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -4800,7 +4800,7 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttr& attr, con
             dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
     }
 
             dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
     }
 

-       wxCoord x_orig = x;
+    wxCoord x_orig = x;

     while (hasTabs)
     {
         // the string has a tab
     while (hasTabs)
     {
         // the string has a tab

diff --git a/src/richtext/richtextbulletspage.cpp b/src/richtext/richtextbulletspage.cpp
index 34dde8e2d21bca7c5cdaceaf4a7c804d021bc5ac..61cad9f528fb72017ffc387161f39e413aca7e6b 100644 (file)
--- a/src/richtext/richtextbulletspage.cpp
+++ b/src/richtext/richtextbulletspage.cpp
@@ -361,7 +361,7 @@ bool wxRichTextBulletsPage::TransferDataFromWindow()
                 wxRichTextBuffer::GetRenderer()->EnumerateStandardBulletNames(standardBulletNames);
                 if (sel < (int) standardBulletNames.GetCount() && m_bulletNameCtrl->GetValue() == selName)
                     attr->SetBulletName(standardBulletNames[sel]);
                 wxRichTextBuffer::GetRenderer()->EnumerateStandardBulletNames(standardBulletNames);
                 if (sel < (int) standardBulletNames.GetCount() && m_bulletNameCtrl->GetValue() == selName)
                     attr->SetBulletName(standardBulletNames[sel]);

-                else            
+                else

                     attr->SetBulletName(m_bulletNameCtrl->GetValue());
             }
             else
                     attr->SetBulletName(m_bulletNameCtrl->GetValue());
             }
             else

diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index 07680343763b8145281548c34b060e0fe474999e..9c0d6c203567e6440ade08f4f990a20e71caa601 100644 (file)
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -256,7 +256,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
             str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
 
             if (thisStyle.HasParagraphSpacingAfter() && thisStyle.GetParagraphSpacingAfter() == 0)
             str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
 
             if (thisStyle.HasParagraphSpacingAfter() && thisStyle.GetParagraphSpacingAfter() == 0)

-               str << wxT(" style=\"line-height: 0px\"");
+                str << wxT(" style=\"line-height: 0px\"");

 
             str << wxT(">");
 
 
             str << wxT(">");
 

diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp
index 1082eabbf1d51b6a5a3565ec26f27bef9cd1c0d3..2efffa46a54f67374726dd8e7d21034e033c4742 100644 (file)
--- a/src/richtext/richtextprint.cpp
+++ b/src/richtext/richtextprint.cpp
@@ -54,9 +54,9 @@ void wxRichTextPrintout::OnPreparePrinting()
 
     m_pageBreaksStart.Clear();
     m_pageBreaksEnd.Clear();
 
     m_pageBreaksStart.Clear();
     m_pageBreaksEnd.Clear();

-    
+

     int lastStartPos = 0;
     int lastStartPos = 0;

-    
+

     wxRect rect, headerRect, footerRect;
 
     /// Sets the DC scaling and returns important page rectangles
     wxRect rect, headerRect, footerRect;
 
     /// Sets the DC scaling and returns important page rectangles


@@ -67,20 +67,20 @@ void wxRichTextPrintout::OnPreparePrinting()
         GetRichTextBuffer()->Invalidate(wxRICHTEXT_ALL);
 
         GetRichTextBuffer()->Layout(*GetDC(), rect, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
         GetRichTextBuffer()->Invalidate(wxRICHTEXT_ALL);
 
         GetRichTextBuffer()->Layout(*GetDC(), rect, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);

-    
+

         // Now calculate the page breaks
         // Now calculate the page breaks

-        
+

         int yOffset = 0;
         int yOffset = 0;

-        
+

         wxRichTextLine* lastLine = NULL;
         wxRichTextLine* lastLine = NULL;

-        
+

         wxRichTextObjectList::compatibility_iterator node = GetRichTextBuffer()->GetChildren().GetFirst();
         while (node)
         {
             // child is a paragraph
             wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
             wxASSERT (child != NULL);
         wxRichTextObjectList::compatibility_iterator node = GetRichTextBuffer()->GetChildren().GetFirst();
         while (node)
         {
             // child is a paragraph
             wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
             wxASSERT (child != NULL);

-            
+

             wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
             while (node2)
             {
             wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
             while (node2)
             {


@@ -90,34 +90,34 @@ void wxRichTextPrintout::OnPreparePrinting()
                 line->SetPosition(wxPoint(line->GetPosition().x, line->GetPosition().y - yOffset));
 
                 int lineY = child->GetPosition().y + line->GetPosition().y;
                 line->SetPosition(wxPoint(line->GetPosition().x, line->GetPosition().y - yOffset));
 
                 int lineY = child->GetPosition().y + line->GetPosition().y;

-                
+

                 // Break the page if either we're going off the bottom, or this paragraph specifies
                 // an explicit page break
                 // Break the page if either we're going off the bottom, or this paragraph specifies
                 // an explicit page break

-                
+

                 if (((lineY + line->GetSize().y) > rect.GetBottom()) ||
                     ((node2 == child->GetLines().GetFirst()) && child->GetAttributes().HasPageBreak()))
                 {
                     // New page starting at this line
                     int newY = rect.y;
                 if (((lineY + line->GetSize().y) > rect.GetBottom()) ||
                     ((node2 == child->GetLines().GetFirst()) && child->GetAttributes().HasPageBreak()))
                 {
                     // New page starting at this line
                     int newY = rect.y;

-                    
+

                     // We increase the offset by the difference between new and old positions
                     // We increase the offset by the difference between new and old positions

-                    
+

                     int increaseOffsetBy = lineY - newY;
                     yOffset += increaseOffsetBy;
                     int increaseOffsetBy = lineY - newY;
                     yOffset += increaseOffsetBy;

-                    
+

                     line->SetPosition(wxPoint(line->GetPosition().x, newY - child->GetPosition().y));
 
                     if (!lastLine)
                         lastLine = line;
                     line->SetPosition(wxPoint(line->GetPosition().x, newY - child->GetPosition().y));
 
                     if (!lastLine)
                         lastLine = line;

-                
+

                     m_pageBreaksStart.Add(lastStartPos);
                     m_pageBreaksEnd.Add(lastLine->GetAbsoluteRange().GetEnd());
                     m_pageBreaksStart.Add(lastStartPos);
                     m_pageBreaksEnd.Add(lastLine->GetAbsoluteRange().GetEnd());

-                    
+

                     lastStartPos = line->GetAbsoluteRange().GetStart();
                     lastStartPos = line->GetAbsoluteRange().GetStart();

-                    
+

                     m_numPages ++;
                 }
                     m_numPages ++;
                 }

-                
+

                 lastLine = line;
 
                 node2 = node2->GetNext();
                 lastLine = line;
 
                 node2 = node2->GetNext();


@@ -173,7 +173,7 @@ void wxRichTextPrintout::RenderPage(wxDC *dc, int page)
         return;
 
     wxBusyCursor wait;
         return;
 
     wxBusyCursor wait;

-    
+

     wxRect textRect, headerRect, footerRect;
 
     /// Sets the DC scaling and returns important page rectangles
     wxRect textRect, headerRect, footerRect;
 
     /// Sets the DC scaling and returns important page rectangles


@@ -191,7 +191,7 @@ void wxRichTextPrintout::RenderPage(wxDC *dc, int page)
             dc->SetTextForeground(*wxBLACK);
         dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 
             dc->SetTextForeground(*wxBLACK);
         dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 

-        // Draw header, if any    
+        // Draw header, if any

         wxRichTextOddEvenPage oddEven = ((page % 2) == 1) ? wxRICHTEXT_PAGE_ODD : wxRICHTEXT_PAGE_EVEN;
 
         wxString headerTextCentre = m_headerFooterData.GetHeaderText(oddEven, wxRICHTEXT_PAGE_CENTRE);
         wxRichTextOddEvenPage oddEven = ((page % 2) == 1) ? wxRICHTEXT_PAGE_ODD : wxRICHTEXT_PAGE_EVEN;
 
         wxString headerTextCentre = m_headerFooterData.GetHeaderText(oddEven, wxRICHTEXT_PAGE_CENTRE);


@@ -204,7 +204,7 @@ void wxRichTextPrintout::RenderPage(wxDC *dc, int page)
 
             //int tx, ty;
             //dc->GetTextExtent(headerTextLeft, & tx, & ty);
 
             //int tx, ty;
             //dc->GetTextExtent(headerTextLeft, & tx, & ty);

-            
+

             int x = headerRect.GetLeft();
             int y = headerRect.GetX();
             dc->DrawText(headerTextLeft, x, y);
             int x = headerRect.GetLeft();
             int y = headerRect.GetX();
             dc->DrawText(headerTextLeft, x, y);


@@ -232,7 +232,7 @@ void wxRichTextPrintout::RenderPage(wxDC *dc, int page)
             dc->DrawText(headerTextRight, x, y);
         }
 
             dc->DrawText(headerTextRight, x, y);
         }
 

-        // Draw footer, if any    
+        // Draw footer, if any

         wxString footerTextCentre = m_headerFooterData.GetFooterText(oddEven, wxRICHTEXT_PAGE_CENTRE);
         wxString footerTextLeft = m_headerFooterData.GetFooterText(oddEven, wxRICHTEXT_PAGE_LEFT);
         wxString footerTextRight = m_headerFooterData.GetFooterText(oddEven, wxRICHTEXT_PAGE_RIGHT);
         wxString footerTextCentre = m_headerFooterData.GetFooterText(oddEven, wxRICHTEXT_PAGE_CENTRE);
         wxString footerTextLeft = m_headerFooterData.GetFooterText(oddEven, wxRICHTEXT_PAGE_LEFT);
         wxString footerTextRight = m_headerFooterData.GetFooterText(oddEven, wxRICHTEXT_PAGE_RIGHT);


@@ -270,7 +270,7 @@ void wxRichTextPrintout::RenderPage(wxDC *dc, int page)
             int y = footerRect.GetBottom() - ty;
             dc->DrawText(footerTextRight, x, y);
         }
             int y = footerRect.GetBottom() - ty;
             dc->DrawText(footerTextRight, x, y);
         }

-    }    
+    }

 
     wxRichTextRange rangeToDraw(m_pageBreaksStart[page-1], m_pageBreaksEnd[page-1]);
 
 
     wxRichTextRange rangeToDraw(m_pageBreaksStart[page-1], m_pageBreaksEnd[page-1]);
 


@@ -304,7 +304,7 @@ void wxRichTextPrintout::CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& he
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);

-    
+

     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.
     float previewScale = (float)(w/(float)pageWidth);
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.
     float previewScale = (float)(w/(float)pageWidth);


@@ -314,22 +314,22 @@ void wxRichTextPrintout::CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& he
     // during printing to be correct when scaling is applied.
     if (!IsPreview())
         m_richTextBuffer->SetScale(scale);
     // during printing to be correct when scaling is applied.
     if (!IsPreview())
         m_richTextBuffer->SetScale(scale);

-    
+

     // Calculate margins
     int marginLeft = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginLeft);
     int marginTop = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginTop);
     int marginRight = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginRight);
     int marginBottom = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginBottom);
     // Calculate margins
     int marginLeft = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginLeft);
     int marginTop = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginTop);
     int marginRight = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginRight);
     int marginBottom = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_marginBottom);

-    
+

     // Header and footer margins
     int headerMargin = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_headerFooterData.GetHeaderMargin());
     int footerMargin = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_headerFooterData.GetFooterMargin());
     // Header and footer margins
     int headerMargin = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_headerFooterData.GetHeaderMargin());
     int footerMargin = wxRichTextObject::ConvertTenthsMMToPixels(ppiPrinterX, m_headerFooterData.GetFooterMargin());

-    
+

     dc->SetUserScale(overallScale, overallScale);
 
     wxRect rect((int) (marginLeft/scale), (int) (marginTop/scale),
                 (int) ((pageWidth - marginLeft - marginRight)/scale), (int)((pageHeight - marginTop - marginBottom)/scale));
     dc->SetUserScale(overallScale, overallScale);
 
     wxRect rect((int) (marginLeft/scale), (int) (marginTop/scale),
                 (int) ((pageWidth - marginLeft - marginRight)/scale), (int)((pageHeight - marginTop - marginBottom)/scale));

-                
+

     headerRect = wxRect(0, 0, 0, 0);
 
     if (!m_headerFooterData.GetHeaderText(wxRICHTEXT_PAGE_ODD, wxRICHTEXT_PAGE_LEFT).IsEmpty() ||
     headerRect = wxRect(0, 0, 0, 0);
 
     if (!m_headerFooterData.GetHeaderText(wxRICHTEXT_PAGE_ODD, wxRICHTEXT_PAGE_LEFT).IsEmpty() ||


@@ -344,15 +344,15 @@ void wxRichTextPrintout::CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& he
             dc->SetFont(m_headerFooterData.GetFont());
         else
             dc->SetFont(*wxNORMAL_FONT);
             dc->SetFont(m_headerFooterData.GetFont());
         else
             dc->SetFont(*wxNORMAL_FONT);

-        
+

         int charHeight = dc->GetCharHeight();
         int charHeight = dc->GetCharHeight();

-        
+

         int headerHeight = (int) (charHeight + headerMargin/scale);
 
         headerRect = wxRect(rect.x, rect.y, rect.width, headerHeight);
 
         rect.y += headerHeight;
         int headerHeight = (int) (charHeight + headerMargin/scale);
 
         headerRect = wxRect(rect.x, rect.y, rect.width, headerHeight);
 
         rect.y += headerHeight;

-        rect.height -= headerHeight;        
+        rect.height -= headerHeight;

     }
 
     footerRect = wxRect(0, 0, 0, 0);
     }
 
     footerRect = wxRect(0, 0, 0, 0);


@@ -369,14 +369,14 @@ void wxRichTextPrintout::CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& he
             dc->SetFont(m_headerFooterData.GetFont());
         else
             dc->SetFont(*wxNORMAL_FONT);
             dc->SetFont(m_headerFooterData.GetFont());
         else
             dc->SetFont(*wxNORMAL_FONT);

-        
+

         int charHeight = dc->GetCharHeight();
         int charHeight = dc->GetCharHeight();

-        
+

         int footerHeight = (int) (charHeight + footerMargin/scale);
 
         footerRect = wxRect(rect.x, rect.y + rect.height, rect.width, footerHeight);
 
         int footerHeight = (int) (charHeight + footerMargin/scale);
 
         footerRect = wxRect(rect.x, rect.y + rect.height, rect.width, footerHeight);
 

-        rect.height -= footerHeight;        
+        rect.height -= footerHeight;

     }
 
     textRect = rect;
     }
 
     textRect = rect;


@@ -414,7 +414,7 @@ wxRichTextPrinting::wxRichTextPrinting(const wxString& name, wxWindow *parentWin
     m_parentWindow = parentWindow;
     m_title = name;
     m_printData = NULL;
     m_parentWindow = parentWindow;
     m_title = name;
     m_printData = NULL;

-    
+

     m_previewRect = wxRect(wxPoint(100, 100), wxSize(800, 800));
 
     m_pageSetupData = new wxPageSetupDialogData;
     m_previewRect = wxRect(wxPoint(100, 100), wxSize(800, 800));
 
     m_pageSetupData = new wxPageSetupDialogData;


@@ -481,7 +481,7 @@ bool wxRichTextPrinting::PreviewFile(const wxString& richTextFile)
     }
     else
         SetRichTextBufferPrinting(new wxRichTextBuffer(*m_richTextBufferPreview));
     }
     else
         SetRichTextBufferPrinting(new wxRichTextBuffer(*m_richTextBufferPreview));

-    
+

     wxRichTextPrintout *p1 = CreatePrintout();
     p1->SetRichTextBuffer(m_richTextBufferPreview);
 
     wxRichTextPrintout *p1 = CreatePrintout();
     p1->SetRichTextBuffer(m_richTextBufferPreview);
 


@@ -497,7 +497,7 @@ bool wxRichTextPrinting::PreviewBuffer(const wxRichTextBuffer& buffer)
 
     wxRichTextPrintout *p1 = CreatePrintout();
     p1->SetRichTextBuffer(m_richTextBufferPreview);
 
     wxRichTextPrintout *p1 = CreatePrintout();
     p1->SetRichTextBuffer(m_richTextBufferPreview);

-    
+

     wxRichTextPrintout *p2 = CreatePrintout();
     p2->SetRichTextBuffer(m_richTextBufferPrinting);
 
     wxRichTextPrintout *p2 = CreatePrintout();
     p2->SetRichTextBuffer(m_richTextBufferPrinting);
 

diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp
index dc39222fb15272a6183015963f191298f6d3d903..1d05028cd870e7acbb395f28acb3d764a115915c 100644 (file)
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -619,7 +619,7 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
     int size = 3;
 #endif
 
     int size = 3;
 #endif
 

-       // Guess a standard font size
+    // Guess a standard font size

     int stdFontSize = 0;
 
     // First see if we have a default/normal style to base the size on
     int stdFontSize = 0;
 
     // First see if we have a default/normal style to base the size on


@@ -628,22 +628,22 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
     size_t i;
     for (i = 0; i < m_styleNames.GetCount(); i++)
     {
     size_t i;
     for (i = 0; i < m_styleNames.GetCount(); i++)
     {

-               wxString name = m_styleNames[i].Lower();
-               if (name.Find(wxT("normal")) != wxNOT_FOUND || name.Find(normalTranslated) != wxNOT_FOUND ||
-                   name.Find(wxT("default")) != wxNOT_FOUND || name.Find(defaultTranslated) != wxNOT_FOUND)
-               {
-               wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]);
-               if (d)
-               {
-                       wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet()));
-                       if (attr2.HasFontSize())
-                       {
-                                       stdFontSize = attr2.GetFontSize();
-                                       break;
-                               }
-                       }
-               }
-       }
+        wxString name = m_styleNames[i].Lower();
+        if (name.Find(wxT("normal")) != wxNOT_FOUND || name.Find(normalTranslated) != wxNOT_FOUND ||
+                name.Find(wxT("default")) != wxNOT_FOUND || name.Find(defaultTranslated) != wxNOT_FOUND)
+        {
+            wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]);
+            if (d)
+            {
+                wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet()));
+                if (attr2.HasFontSize())
+                {
+                    stdFontSize = attr2.GetFontSize();
+                    break;
+                }
+            }
+        }
+    }

 
     if (stdFontSize == 0)
     {
 
     if (stdFontSize == 0)
     {


@@ -670,13 +670,13 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
         {
             if (sizes[i] > mostCommonSize)
                 mostCommonSize = i;
         {
             if (sizes[i] > mostCommonSize)
                 mostCommonSize = i;

-               }
+        }

         if (mostCommonSize > 0)
             stdFontSize = mostCommonSize;
     }
 
     if (stdFontSize == 0)
         if (mostCommonSize > 0)
             stdFontSize = mostCommonSize;
     }
 
     if (stdFontSize == 0)

-       stdFontSize = 12;
+        stdFontSize = 12;

 
     int thisFontSize = ((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) != 0) ? attr.GetFontSize() : stdFontSize;
 
 
     int thisFontSize = ((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) != 0) ? attr.GetFontSize() : stdFontSize;
 

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 84b4e557904aa8ee5d7f82f291076a8c2dc3bb2d..aa47c514c46946913e98af2a129fe931545ea489 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -187,7 +187,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
 
         g_free(families);
 
 
         g_free(families);
 

-        // Some gtk+ systems might query for a non-existing font from 
+        // Some gtk+ systems might query for a non-existing font from

         // wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) on initialization,
         // don't assert until wxSystemSettings::GetFont is checked for this - MR
         // wxASSERT_MSG( family, "No appropriate PangoFontFamily found for ::description" );
         // wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) on initialization,
         // don't assert until wxSystemSettings::GetFont is checked for this - MR
         // wxASSERT_MSG( family, "No appropriate PangoFontFamily found for ::description" );


@@ -1027,7 +1027,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
 
         int i, round; // counters
 
 
         int i, round; // counters
 

-        // first round: search for equal, then for smaller and for larger size 
+        // first round: search for equal, then for smaller and for larger size

         // with the given weight and style
         int testweight = weight;
         int teststyle = style;
         // with the given weight and style
         int testweight = weight;
         int teststyle = style;

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index 955d41fb8051d014736796b93e9121647ce4623a..0fbf87aa14144c8263200295b2510c3e9ea1b9ef 100644 (file)
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -304,7 +304,7 @@ static gint gtk_window_realize_callback(GtkWidget* widget,
                                         wxGStreamerMediaBackend* be)
 {
     gdk_flush();
                                         wxGStreamerMediaBackend* be)
 {
     gdk_flush();

-    
+

     GdkWindow *window = widget->window;
     wxASSERT(window);
 
     GdkWindow *window = widget->window;
     wxASSERT(window);
 


@@ -709,7 +709,7 @@ void wxGStreamerMediaBackend::SetupXOverlay()
     else
     {
         gdk_flush();
     else
     {
         gdk_flush();

-    
+

         GdkWindow *window = m_ctrl->m_wxwindow->window;
         wxASSERT(window);
 #endif
         GdkWindow *window = m_ctrl->m_wxwindow->window;
         wxASSERT(window);
 #endif

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 2f79104e234eb127b1617f2a202e95a9137e30e3..05426d667ae373c2f025b9f9a19c7586abd1b837 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -267,7 +267,7 @@ void wxMimeTypesManagerImpl::LoadXDGGlobs(const wxString& filename)
        ext.Remove( 0, 2 );
        wxArrayString exts;
        exts.Add( ext );
        ext.Remove( 0, 2 );
        wxArrayString exts;
        exts.Add( ext );

-       
+

        AddToMimeData(mime, wxEmptyString, NULL, exts, wxEmptyString, true );
     }
 }
        AddToMimeData(mime, wxEmptyString, NULL, exts, wxEmptyString, true );
     }
 }


@@ -844,7 +844,7 @@ wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ex
                 // found
                 wxFileType *fileType = new wxFileType;
                 fileType->m_impl->Init(this, n);
                 // found
                 wxFileType *fileType = new wxFileType;
                 fileType->m_impl->Init(this, n);

-                
+

                 return fileType;
             }
         }
                 return fileType;
             }
         }

diff --git a/src/unix/net.cpp b/src/unix/net.cpp
index a87a2e8442d7c860a019475f17349ca1688672ca..2b9d2594ac77f1742f5d67b9818b09430b5fbf7e 100644 (file)
--- a/src/unix/net.cpp
+++ b/src/unix/net.cpp
@@ -95,7 +95,7 @@ public:
 
    /// Hang up the currently active dial up connection.
    virtual bool HangUp();
 
    /// Hang up the currently active dial up connection.
    virtual bool HangUp();

-   
+

    // returns TRUE if the computer is connected to the network: under Windows,
    // this just means that a RAS connection exists, under Unix we check that
    // the "well-known host" (as specified by SetWellKnownHost) is reachable
    // returns TRUE if the computer is connected to the network: under Windows,
    // this just means that a RAS connection exists, under Unix we check that
    // the "well-known host" (as specified by SetWellKnownHost) is reachable


@@ -145,7 +145,7 @@ public:
 private:
    /// -1: don´t know, 0 = no, 1 = yes
    int m_IsOnline;
 private:
    /// -1: don´t know, 0 = no, 1 = yes
    int m_IsOnline;

-   
+

    ///  Can we use ifconfig to list active devices?
    int m_CanUseIfconfig;
    /// The path to ifconfig
    ///  Can we use ifconfig to list active devices?
    int m_CanUseIfconfig;
    /// The path to ifconfig


@@ -299,7 +299,7 @@ wxDialUpManagerImpl::CheckStatus(void) const
   3. check /proc/net/dev on linux??
      This method should be preferred, if possible. Need to do more
      testing.
   3. check /proc/net/dev on linux??
      This method should be preferred, if possible. Need to do more
      testing.

-    
+

 */
 
 void
 */
 
 void


@@ -322,13 +322,13 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    if(m_CanUseIfconfig != 0) // unknown or yes
    {
       wxASSERT(m_IfconfigPath.length());
    if(m_CanUseIfconfig != 0) // unknown or yes
    {
       wxASSERT(m_IfconfigPath.length());

-      
+

       wxString tmpfile = wxFileName::CreateTempFileName("_wxdialuptest");
       wxString cmd = "/bin/sh -c \'";
       cmd << m_IfconfigPath << " >" << tmpfile <<  '\'';
       /* I tried to add an option to wxExecute() to not close stdout,
          so we could let ifconfig write directly to the tmpfile, but
       wxString tmpfile = wxFileName::CreateTempFileName("_wxdialuptest");
       wxString cmd = "/bin/sh -c \'";
       cmd << m_IfconfigPath << " >" << tmpfile <<  '\'';
       /* I tried to add an option to wxExecute() to not close stdout,
          so we could let ifconfig write directly to the tmpfile, but

-         this does not work. That should be faster, as it doesn´t call 
+         this does not work. That should be faster, as it doesn´t call

          the shell first. I have no idea why. :-(  (KB) */
 #if 0
       // temporarily redirect stdout/stderr:
          the shell first. I have no idea why. :-(  (KB) */
 #if 0
       // temporarily redirect stdout/stderr:


@@ -388,22 +388,22 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    // This can be used under Win 9x, too!
    struct hostent     *hp;
    struct sockaddr_in  serv_addr;
    // This can be used under Win 9x, too!
    struct hostent     *hp;
    struct sockaddr_in  serv_addr;

-   int sockfd;
+   int sockfd;

 
    m_IsOnline = 0; // assume false
    if((hp = gethostbyname(m_BeaconHost)) == NULL)
       return; // no DNS no net
 
    m_IsOnline = 0; // assume false
    if((hp = gethostbyname(m_BeaconHost)) == NULL)
       return; // no DNS no net

-   
-   serv_addr.sin_family                = hp->h_addrtype;
+
+   serv_addr.sin_family = hp->h_addrtype;

    memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);
    memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);

-   serv_addr.sin_port          = htons(m_BeaconPort);
-   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) 
-   {   
+   serv_addr.sin_port = htons(m_BeaconPort);
+   if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
+   {

       //  sys_error("cannot create socket for gw");
       return;
    }
    if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
       //  sys_error("cannot create socket for gw");
       return;
    }
    if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)

-   {   
+   {

       //sys_error("cannot connect to server");
       return;
    }
       //sys_error("cannot connect to server");
       return;
    }

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 7394cc50e6babc6ed0df7b5a518ff4e1285d3826..18bea9bdef0163ffc782f8f1e38654411585f162 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -880,9 +880,9 @@ wxLinuxDistributionInfo wxGetLinuxDistributionInfo()
     const wxString desc = wxGetCommandOutput(wxT("lsb_release --description"));
     const wxString rel = wxGetCommandOutput(wxT("lsb_release --release"));
     const wxString codename = wxGetCommandOutput(wxT("lsb_release --codename"));
     const wxString desc = wxGetCommandOutput(wxT("lsb_release --description"));
     const wxString rel = wxGetCommandOutput(wxT("lsb_release --release"));
     const wxString codename = wxGetCommandOutput(wxT("lsb_release --codename"));

-    
+

     wxLinuxDistributionInfo ret;
     wxLinuxDistributionInfo ret;

-    
+

     id.StartsWith("Distributor ID:\t", &ret.Id);
     desc.StartsWith("Description:\t", &ret.Description);
     rel.StartsWith("Release:\t", &ret.Release);
     id.StartsWith("Distributor ID:\t", &ret.Id);
     desc.StartsWith("Description:\t", &ret.Description);
     rel.StartsWith("Release:\t", &ret.Release);

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index e528547e835e1dca13ba9f3c8b3d11229adc770e..ce4fd780e35314dbcf9733e17826622d2ce7d786 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -295,7 +295,7 @@ bool wxBitmapRefData::Create(int width, int height, int depth)
 #else // !wxUSE_NANOX
     Window xroot = RootWindow(m_display, xscreen);
 
 #else // !wxUSE_NANOX
     Window xroot = RootWindow(m_display, xscreen);
 

-    *(depth == 1 ? &m_bitmap : &m_pixmap) = 
+    *(depth == 1 ? &m_bitmap : &m_pixmap) =

         XCreatePixmap(m_display, xroot, width, height, depth);
 #endif // wxUSE_NANOX/!wxUSE_NANOX
 
         XCreatePixmap(m_display, xroot, width, height, depth);
 #endif // wxUSE_NANOX/!wxUSE_NANOX
 

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index dfe17e7020613dafbf418936d5ac22a551cb1492..3e1db0c360325fbb8fb262a183af7ee4cc185d7e 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -1291,7 +1291,7 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
   // wxUSE_NANOX/!wxUSE_NANOX
 
 bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
   // wxUSE_NANOX/!wxUSE_NANOX
 
 bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-                         wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

                          wxRasterOperationMode logical_func, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
                          wxRasterOperationMode logical_func, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index be343b1a3b782b12d47cf89cac788bb853778729..e8124afc8452456598a014c9e14d26a0cd011e48 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -26,14 +26,14 @@ IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl,wxWindowDCImpl)
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxDC *owner )
   : wxWindowDCImpl( owner )
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxDC *owner )
   : wxWindowDCImpl( owner )

-{ 
+{

     Init();
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl(  wxDC *owner, wxBitmap& bitmap )
   : wxWindowDCImpl( owner )
     Init();
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl(  wxDC *owner, wxBitmap& bitmap )
   : wxWindowDCImpl( owner )

-{ 
-    Init(); 
+{
+    Init();

     DoSelect(bitmap);
 }
 
     DoSelect(bitmap);
 }
 

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index a15a76418a3ba27fa9611e19e40817e8d066b249..49a2b7dfd52a091062aff5f1bfdeb9db4d96c056 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -326,7 +326,7 @@ void wxFontRefData::InitFromNative()
     }
 
     switch ( wxToupper( m_nativeFontInfo.
     }
 
     switch ( wxToupper( m_nativeFontInfo.

-                       GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )
+                GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )

     {
         case wxT('I'):   // italique
             m_style = wxFONTSTYLE_ITALIC;
     {
         case wxT('I'):   // italique
             m_style = wxFONTSTYLE_ITALIC;

diff --git a/src/x11/minifram.cpp b/src/x11/minifram.cpp
index 73c5310f8799020d904f743f5a8123525066f9a5..e2b1df409046ffa79939fade92a3f2fc44330e3e 100644 (file)
--- a/src/x11/minifram.cpp
+++ b/src/x11/minifram.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

diff --git a/src/x11/pango_x.cpp b/src/x11/pango_x.cpp
index 405514c43aa5a153dceb769f5f571bd4ec171329..8836e142c175c043ccd5128d64f084346c946338 100644 (file)
--- a/src/x11/pango_x.cpp
+++ b/src/x11/pango_x.cpp
@@ -1,6 +1,6 @@
 /**
 /**

- * This file gets included from dcclient.cpp and implements 
- * the X11 interface to Pango. 
+ * This file gets included from dcclient.cpp and implements
+ * the X11 interface to Pango.

  * Copyright (C) Owen Taylor and Robert Roebling.
  * Licence: The wxWindows licence
  */
  * Copyright (C) Owen Taylor and Robert Roebling.
  * Licence: The wxWindows licence
  */


@@ -15,31 +15,31 @@ x11_draw_glyphs( Drawable       drawable,
                         int            y,
                         PangoGlyphString *glyphs,
                  wxColour       &colour );
                         int            y,
                         PangoGlyphString *glyphs,
                  wxColour       &colour );

-                 
-void 
+
+void

 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,
 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,

-                                  int              x, 
+                                  int              x,

                                   int              y,
                                   PangoLayoutLine  *line,
                                   wxColour       &colour );
                                   int              y,
                                   PangoLayoutLine  *line,
                                   wxColour       &colour );

-                                  
-void 
+
+void

 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,
 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,

-                             int           x, 
+                             int           x,

                              int           y,
                              PangoLayout  *layout,
                              wxColour     &colour );
                              int           y,
                              PangoLayout  *layout,
                              wxColour     &colour );

-                             
-void 
+
+void

 x11_draw_layout( Drawable     drawable,
                  GC           gc,
 x11_draw_layout( Drawable     drawable,
                  GC           gc,

-                 int          x, 
+                 int          x,

                  int          y,
                  PangoLayout *layout,
                  wxColour    &colour);
                  int          y,
                  PangoLayout *layout,
                  wxColour    &colour);

-                 
+

 void
 x11_pango_get_item_properties( PangoItem      *item,
                                PangoUnderline *uline,
 void
 x11_pango_get_item_properties( PangoItem      *item,
                                PangoUnderline *uline,


@@ -81,7 +81,7 @@ x11_draw_glyphs( Drawable            drawable,
         color.color.blue = colour.Blue() << 8;
         color.color.alpha = 65000;
         pango_xft_render( draw, &color, font, glyphs, x, y );
         color.color.blue = colour.Blue() << 8;
         color.color.alpha = 65000;
         pango_xft_render( draw, &color, font, glyphs, x, y );

-        
+

         XftDrawDestroy( draw );
     }
     else
         XftDrawDestroy( draw );
     }
     else


@@ -91,10 +91,10 @@ x11_draw_glyphs( Drawable            drawable,
     }
 }
 
     }
 }
 

-void 
+void

 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,
 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,

-                                  int              x, 
+                                  int              x,

                                   int              y,
                                   PangoLayoutLine *line,
                                   wxColour        &colour )
                                   int              y,
                                   PangoLayoutLine *line,
                                   wxColour        &colour )


@@ -107,9 +107,9 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
     gint rise = 0;
 
     context = pango_layout_get_context (line->layout);
     gint rise = 0;
 
     context = pango_layout_get_context (line->layout);

-  
+

     pango_layout_line_get_extents (line,NULL, &overall_rect);
     pango_layout_line_get_extents (line,NULL, &overall_rect);

-  
+

     GSList *tmp_list = line->runs;
     while (tmp_list)
     {
     GSList *tmp_list = line->runs;
     while (tmp_list)
     {


@@ -118,16 +118,16 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
         PangoColor fg_color, bg_color;
         gboolean strike, fg_set, bg_set, shape_set;
         gint risen_y;
         PangoColor fg_color, bg_color;
         gboolean strike, fg_set, bg_set, shape_set;
         gint risen_y;

-      
+

         tmp_list = tmp_list->next;
         tmp_list = tmp_list->next;

-      
-        x11_pango_get_item_properties (run->item, &uline, 
-            &strike, &rise,  &fg_color, &fg_set, &bg_color, &bg_set, 
+
+        x11_pango_get_item_properties (run->item, &uline,
+            &strike, &rise,  &fg_color, &fg_set, &bg_color, &bg_set,

             &shape_set, &ink_rect, &logical_rect);
 
         /* we subtract the rise because X coordinates are upside down */
         risen_y = y - rise / PANGO_SCALE;
             &shape_set, &ink_rect, &logical_rect);
 
         /* we subtract the rise because X coordinates are upside down */
         risen_y = y - rise / PANGO_SCALE;

-      
+

         if (!shape_set)
         {
             if (uline == PANGO_UNDERLINE_NONE)
         if (!shape_set)
         {
             if (uline == PANGO_UNDERLINE_NONE)


@@ -148,12 +148,12 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
         {
             int gx = x + x_off / PANGO_SCALE;
             int gy = risen_y;
         {
             int gx = x + x_off / PANGO_SCALE;
             int gy = risen_y;

-          
+

             x11_draw_glyphs( drawable, gc, run->item->analysis.font, gx, gy, run->glyphs, colour );
         }
             x11_draw_glyphs( drawable, gc, run->item->analysis.font, gx, gy, run->glyphs, colour );
         }

-      
+

         if (uline ==  PANGO_UNDERLINE_SINGLE)
         if (uline ==  PANGO_UNDERLINE_SINGLE)

-        {  
+        {

             XDrawLine( wxGlobalDisplay(), drawable, gc,
                          x + (x_off + ink_rect.x) / PANGO_SCALE - 1,
                           risen_y + 1,
             XDrawLine( wxGlobalDisplay(), drawable, gc,
                          x + (x_off + ink_rect.x) / PANGO_SCALE - 1,
                           risen_y + 1,


@@ -165,40 +165,40 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
     }
 }
 
     }
 }
 

-void 
+void

 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,
 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,

-                             int           x, 
+                             int           x,

                              int           y,
                              PangoLayout  *layout,
                              wxColour       &colour )
 {
     PangoLayoutIter *iter = pango_layout_get_iter (layout);
                              int           y,
                              PangoLayout  *layout,
                              wxColour       &colour )
 {
     PangoLayoutIter *iter = pango_layout_get_iter (layout);

-  
+

     do
     {
         PangoLayoutLine *line = pango_layout_iter_get_line (iter);
     do
     {
         PangoLayoutLine *line = pango_layout_iter_get_line (iter);

-      
+

         PangoRectangle logical_rect;
         pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
         PangoRectangle logical_rect;
         pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);

-        
+

         int baseline = pango_layout_iter_get_baseline (iter);
         int baseline = pango_layout_iter_get_baseline (iter);

-      
+

         x11_draw_layout_line_with_colors( drawable, gc,
                                           x + logical_rect.x / PANGO_SCALE,
                                           y + baseline / PANGO_SCALE,
                                           line,
                                           colour );
         x11_draw_layout_line_with_colors( drawable, gc,
                                           x + logical_rect.x / PANGO_SCALE,
                                           y + baseline / PANGO_SCALE,
                                           line,
                                           colour );

-                                          
+

     } while (pango_layout_iter_next_line (iter));
 
     pango_layout_iter_free (iter);
 }
 
     } while (pango_layout_iter_next_line (iter));
 
     pango_layout_iter_free (iter);
 }
 

-void 
+void

 x11_draw_layout( Drawable     drawable,
                  GC           gc,
 x11_draw_layout( Drawable     drawable,
                  GC           gc,

-                 int          x, 
+                 int          x,

                  int          y,
                  PangoLayout *layout,
                  wxColour    &colour)
                  int          y,
                  PangoLayout *layout,
                  wxColour    &colour)


@@ -225,10 +225,10 @@ x11_pango_get_item_properties( PangoItem      *item,
 
   if (strikethrough)
       *strikethrough = FALSE;
 
   if (strikethrough)
       *strikethrough = FALSE;

-  
+

   if (fg_set)
     *fg_set = FALSE;
   if (fg_set)
     *fg_set = FALSE;

-  
+

   if (bg_set)
     *bg_set = FALSE;
 
   if (bg_set)
     *bg_set = FALSE;
 


@@ -253,21 +253,21 @@ x11_pango_get_item_properties( PangoItem      *item,
            if (strikethrough)
                *strikethrough = ((PangoAttrInt *)attr)->value;
            break;
            if (strikethrough)
                *strikethrough = ((PangoAttrInt *)attr)->value;
            break;

-           
+       

        case PANGO_ATTR_FOREGROUND:
          if (fg_color)
            *fg_color = ((PangoAttrColor *)attr)->color;
          if (fg_set)
            *fg_set = TRUE;
        case PANGO_ATTR_FOREGROUND:
          if (fg_color)
            *fg_color = ((PangoAttrColor *)attr)->color;
          if (fg_set)
            *fg_set = TRUE;

-         
+       

          break;
          break;

-         
+       

        case PANGO_ATTR_BACKGROUND:
          if (bg_color)
            *bg_color = ((PangoAttrColor *)attr)->color;
          if (bg_set)
            *bg_set = TRUE;
        case PANGO_ATTR_BACKGROUND:
          if (bg_color)
            *bg_color = ((PangoAttrColor *)attr)->color;
          if (bg_set)
            *bg_set = TRUE;

-         
+       

          break;
 
        case PANGO_ATTR_SHAPE:
          break;
 
        case PANGO_ATTR_SHAPE:


@@ -283,7 +283,7 @@ x11_pango_get_item_properties( PangoItem      *item,
           if (rise)
             *rise = ((PangoAttrInt *)attr)->value;
           break;
           if (rise)
             *rise = ((PangoAttrInt *)attr)->value;
           break;

-          
+

        default:
          break;
        }
        default:
          break;
        }

diff --git a/src/x11/pangox11.cpp b/src/x11/pangox11.cpp
index 3f4f0cc0c0d19a303948c1f6e1a1ab9253ed4bf4..9b37a00c2349105dda57868e9743a1002b994412 100644 (file)
--- a/src/x11/pangox11.cpp
+++ b/src/x11/pangox11.cpp
@@ -1,6 +1,6 @@
 /**
 /**

- * This file gets included from dcclient.cpp and implements 
- * the X11 interface to Pango. 
+ * This file gets included from dcclient.cpp and implements
+ * the X11 interface to Pango.

  * Copyright (C) Owen Taylor and Robert Roebling.
  * Licence: The wxWindows licence
  */
  * Copyright (C) Owen Taylor and Robert Roebling.
  * Licence: The wxWindows licence
  */


@@ -14,32 +14,32 @@ x11_draw_glyphs( Drawable       drawable,
                         int            x,
                         int            y,
                         PangoGlyphString *glyphs);
                         int            x,
                         int            y,
                         PangoGlyphString *glyphs);

-                 
-void 
+
+void

 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,
 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,

-                                  int              x, 
+                                  int              x,

                                   int              y,
                                   PangoLayoutLine  *line,
                                   XColor           *foreground,
                                   XColor           *background);
                                   int              y,
                                   PangoLayoutLine  *line,
                                   XColor           *foreground,
                                   XColor           *background);

-                                  
-void 
+
+void

 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,
 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,

-                             int           x, 
+                             int           x,

                              int           y,
                              PangoLayout  *layout,
                              XColor       *foreground,
                              XColor       *background);
                              int           y,
                              PangoLayout  *layout,
                              XColor       *foreground,
                              XColor       *background);

-                             
-void 
+
+void

 x11_draw_layout( Drawable     drawable,
                  GC           gc,
 x11_draw_layout( Drawable     drawable,
                  GC           gc,

-                 int          x, 
+                 int          x,

                  int          y,
                  PangoLayout *layout);
                  int          y,
                  PangoLayout *layout);

-                 
+

 void
 x11_pango_get_item_properties( PangoItem      *item,
                                PangoUnderline *uline,
 void
 x11_pango_get_item_properties( PangoItem      *item,
                                PangoUnderline *uline,


@@ -73,10 +73,10 @@ x11_draw_glyphs( Drawable       drawable,
     }
 }
 
     }
 }
 

-void 
+void

 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,
 x11_draw_layout_line_with_colors( Drawable         drawable,
                                   GC               gc,

-                                  int              x, 
+                                  int              x,

                                   int              y,
                                   PangoLayoutLine  *line,
                                   XColor           *foreground,
                                   int              y,
                                   PangoLayoutLine  *line,
                                   XColor           *foreground,


@@ -90,9 +90,9 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
     gint rise = 0;
 
     context = pango_layout_get_context (line->layout);
     gint rise = 0;
 
     context = pango_layout_get_context (line->layout);

-  
+

     pango_layout_line_get_extents (line,NULL, &overall_rect);
     pango_layout_line_get_extents (line,NULL, &overall_rect);

-  
+

     GSList *tmp_list = line->runs;
     while (tmp_list)
     {
     GSList *tmp_list = line->runs;
     while (tmp_list)
     {


@@ -101,16 +101,16 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
         PangoColor fg_color, bg_color;
         gboolean strike, fg_set, bg_set, shape_set;
         gint risen_y;
         PangoColor fg_color, bg_color;
         gboolean strike, fg_set, bg_set, shape_set;
         gint risen_y;

-      
+

         tmp_list = tmp_list->next;
         tmp_list = tmp_list->next;

-      
-        x11_pango_get_item_properties (run->item, &uline, 
-            &strike, &rise,  &fg_color, &fg_set, &bg_color, &bg_set, 
+
+        x11_pango_get_item_properties (run->item, &uline,
+            &strike, &rise,  &fg_color, &fg_set, &bg_color, &bg_set,

             &shape_set, &ink_rect, &logical_rect);
 
         /* we subtract the rise because X coordinates are upside down */
         risen_y = y - rise / PANGO_SCALE;
             &shape_set, &ink_rect, &logical_rect);
 
         /* we subtract the rise because X coordinates are upside down */
         risen_y = y - rise / PANGO_SCALE;

-      
+

         if (!shape_set)
         {
             if (uline == PANGO_UNDERLINE_NONE)
         if (!shape_set)
         {
             if (uline == PANGO_UNDERLINE_NONE)


@@ -131,12 +131,12 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
         {
             int gx = x + x_off / PANGO_SCALE;
             int gy = risen_y;
         {
             int gx = x + x_off / PANGO_SCALE;
             int gy = risen_y;

-          
+

             x11_draw_glyphs( drawable, gc, run->item->analysis.font, gx, gy, run->glyphs);
         }
             x11_draw_glyphs( drawable, gc, run->item->analysis.font, gx, gy, run->glyphs);
         }

-      
+

         if (uline ==  PANGO_UNDERLINE_SINGLE)
         if (uline ==  PANGO_UNDERLINE_SINGLE)

-        {  
+        {

             XDrawLine( wxGlobalDisplay(), drawable, gc,
                          x + (x_off + ink_rect.x) / PANGO_SCALE - 1,
                           risen_y + 1,
             XDrawLine( wxGlobalDisplay(), drawable, gc,
                          x + (x_off + ink_rect.x) / PANGO_SCALE - 1,
                           risen_y + 1,


@@ -148,42 +148,42 @@ x11_draw_layout_line_with_colors( Drawable         drawable,
     }
 }
 
     }
 }
 

-void 
+void

 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,
 x11_draw_layout_with_colors( Drawable      drawable,
                              GC            gc,

-                             int           x, 
+                             int           x,

                              int           y,
                              PangoLayout  *layout,
                              XColor       *foreground,
                              XColor       *background)
 {
     PangoLayoutIter *iter = pango_layout_get_iter (layout);
                              int           y,
                              PangoLayout  *layout,
                              XColor       *foreground,
                              XColor       *background)
 {
     PangoLayoutIter *iter = pango_layout_get_iter (layout);

-  
+

     do
     {
         PangoLayoutLine *line = pango_layout_iter_get_line (iter);
     do
     {
         PangoLayoutLine *line = pango_layout_iter_get_line (iter);

-      
+

         PangoRectangle logical_rect;
         pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
         PangoRectangle logical_rect;
         pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);

-        
+

         int baseline = pango_layout_iter_get_baseline (iter);
         int baseline = pango_layout_iter_get_baseline (iter);

-      
+

         x11_draw_layout_line_with_colors( drawable, gc,
                                           x + logical_rect.x / PANGO_SCALE,
                                           y + baseline / PANGO_SCALE,
                                           line,
                                           foreground,
                                           background);
         x11_draw_layout_line_with_colors( drawable, gc,
                                           x + logical_rect.x / PANGO_SCALE,
                                           y + baseline / PANGO_SCALE,
                                           line,
                                           foreground,
                                           background);

-                                          
+

     } while (pango_layout_iter_next_line (iter));
 
     pango_layout_iter_free (iter);
 }
 
     } while (pango_layout_iter_next_line (iter));
 
     pango_layout_iter_free (iter);
 }
 

-void 
+void

 x11_draw_layout( Drawable     drawable,
                  GC           gc,
 x11_draw_layout( Drawable     drawable,
                  GC           gc,

-                 int          x, 
+                 int          x,

                  int          y,
                  PangoLayout *layout)
 {
                  int          y,
                  PangoLayout *layout)
 {


@@ -209,10 +209,10 @@ x11_pango_get_item_properties( PangoItem      *item,
 
   if (strikethrough)
       *strikethrough = FALSE;
 
   if (strikethrough)
       *strikethrough = FALSE;

-  
+

   if (fg_set)
     *fg_set = FALSE;
   if (fg_set)
     *fg_set = FALSE;

-  
+

   if (bg_set)
     *bg_set = FALSE;
 
   if (bg_set)
     *bg_set = FALSE;
 


@@ -237,21 +237,21 @@ x11_pango_get_item_properties( PangoItem      *item,
            if (strikethrough)
                *strikethrough = ((PangoAttrInt *)attr)->value;
            break;
            if (strikethrough)
                *strikethrough = ((PangoAttrInt *)attr)->value;
            break;

-           
+       

        case PANGO_ATTR_FOREGROUND:
          if (fg_color)
            *fg_color = ((PangoAttrColor *)attr)->color;
          if (fg_set)
            *fg_set = TRUE;
        case PANGO_ATTR_FOREGROUND:
          if (fg_color)
            *fg_color = ((PangoAttrColor *)attr)->color;
          if (fg_set)
            *fg_set = TRUE;

-         
+       

          break;
          break;

-         
+       

        case PANGO_ATTR_BACKGROUND:
          if (bg_color)
            *bg_color = ((PangoAttrColor *)attr)->color;
          if (bg_set)
            *bg_set = TRUE;
        case PANGO_ATTR_BACKGROUND:
          if (bg_color)
            *bg_color = ((PangoAttrColor *)attr)->color;
          if (bg_set)
            *bg_set = TRUE;

-         
+       

          break;
 
        case PANGO_ATTR_SHAPE:
          break;
 
        case PANGO_ATTR_SHAPE:


@@ -267,7 +267,7 @@ x11_pango_get_item_properties( PangoItem      *item,
           if (rise)
             *rise = ((PangoAttrInt *)attr)->value;
           break;
           if (rise)
             *rise = ((PangoAttrInt *)attr)->value;
           break;

-          
+

        default:
          break;
        }
        default:
          break;
        }

diff --git a/src/xrc/xh_collpane.cpp b/src/xrc/xh_collpane.cpp
index 06b347c2272c93089e0ba3240fa02699e74bd516..70b50113faecfef963ef4f5eacd58c416276f2d9 100644 (file)
--- a/src/xrc/xh_collpane.cpp
+++ b/src/xrc/xh_collpane.cpp
@@ -26,7 +26,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler)
 

-wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler() 
+wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler()

 : wxXmlResourceHandler(), m_isInside(false)
 {
     XRC_ADD_STYLE(wxCP_NO_TLW_RESIZE);
 : wxXmlResourceHandler(), m_isInside(false)
 {
     XRC_ADD_STYLE(wxCP_NO_TLW_RESIZE);