From 1b88201ff5f0f9ed18db555b70eb7123c8a7c9c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 17 Oct 2006 14:44:52 +0000 Subject: [PATCH] Headers cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/NSView.h | 9 +-- include/wx/cocoa/bitmap.h | 11 +-- include/wx/cocoa/button.h | 11 +-- include/wx/cocoa/control.h | 9 +-- include/wx/cocoa/cursor.h | 15 ++-- include/wx/cocoa/dcclient.h | 5 +- include/wx/cocoa/dcmemory.h | 5 +- include/wx/cocoa/gauge.h | 5 +- include/wx/cocoa/icon.h | 5 +- include/wx/cocoa/region.h | 7 +- include/wx/cocoa/scrolbar.h | 5 +- include/wx/cocoa/slider.h | 5 +- include/wx/cocoa/spinbutt.h | 9 +-- include/wx/cocoa/stattext.h | 7 +- include/wx/gtk/gauge.h | 11 +-- include/wx/gtk/menu.h | 7 +- include/wx/gtk/stattext.h | 15 ++-- include/wx/gtk1/gauge.h | 5 +- include/wx/gtk1/menu.h | 5 +- include/wx/gtk1/stattext.h | 5 +- include/wx/html/webkit.h | 9 +-- include/wx/mac/carbon/cursor.h | 4 +- include/wx/mac/carbon/dnd.h | 16 ++--- include/wx/mac/carbon/drawer.h | 31 +++++---- include/wx/mac/carbon/fontdlg.h | 7 +- include/wx/mac/carbon/mimetype.h | 30 ++++---- include/wx/mac/carbon/private.h | 16 ++--- include/wx/mac/carbon/toolbar.h | 8 +-- include/wx/mac/classic/cursor.h | 6 +- include/wx/mac/classic/dnd.h | 18 +++-- include/wx/mac/classic/private.h | 96 +++++++++++++------------- include/wx/mac/classic/private/print.h | 31 +++++---- include/wx/mac/classic/taskbarosx.h | 20 +++--- include/wx/mac/corefoundation/hid.h | 5 +- include/wx/motif/toolbar.h | 28 ++++---- include/wx/msw/missing.h | 4 +- include/wx/os2/helpwin.h | 6 +- include/wx/os2/pnghand.h | 7 +- include/wx/os2/pngread.h | 33 ++++----- include/wx/richtext/richtexthtml.h | 94 ++++++++++++------------- include/wx/unix/joystick.h | 7 +- include/wx/unix/sound.h | 23 +++--- include/wx/x11/cursor.h | 6 +- include/wx/x11/dcprint.h | 11 ++- include/wx/x11/dcscreen.h | 7 +- include/wx/x11/font.h | 6 +- include/wx/x11/joystick.h | 24 +++---- include/wx/x11/minifram.h | 12 ++-- include/wx/x11/print.h | 14 ++-- 49 files changed, 376 insertions(+), 359 deletions(-) diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h index 7fdaba8c3a..37e7016083 100644 --- a/include/wx/cocoa/NSView.h +++ b/include/wx/cocoa/NSView.h @@ -4,7 +4,7 @@ // Author: David Elliott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -30,7 +30,7 @@ protected: static void *sm_cocoaObserver; public: virtual wxWindow* GetWxWindow() const - { return NULL; } + { return NULL; } virtual void Cocoa_FrameChanged(void) = 0; virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent) { return false; } @@ -61,8 +61,9 @@ public: virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent) { return false; } virtual bool Cocoa_resetCursorRects() - { return false; } + { return false; } virtual ~wxCocoaNSView() { } }; -#endif // _WX_COCOA_NSVIEW_H_ +#endif + // __WX_COCOA_NSVIEW_H__ diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index bcf1865752..efd4480f02 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/cocoa/bitmap.h +// Name: wx/cocoa/bitmap.h // Purpose: wxBitmap class // Author: David Elliott // Modified by: // Created: 2003/07/19 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_BITMAP_H__ @@ -86,7 +86,7 @@ public: // destructor virtual ~wxBitmap(); - + // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ @@ -131,7 +131,7 @@ public: void SetMask(wxMask *mask) ; int GetBitmapType() const; - + inline bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; } inline bool operator != (const wxBitmap& bitmap) const @@ -155,4 +155,5 @@ class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase DECLARE_ABSTRACT_CLASS(wxBitmapHandler) }; -#endif // __WX_COCOA_BITMAP_H__ +#endif + // __WX_COCOA_BITMAP_H__ diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h index 84acb8607f..aefc9d1369 100644 --- a/include/wx/cocoa/button.h +++ b/include/wx/cocoa/button.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2002/12/29 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_BUTTON_H__ @@ -36,7 +36,7 @@ public: { Create(parent, winid, label, pos, size, style, validator, name); } - + bool Create(wxWindow *parent, wxWindowID winid, const wxString& label = wxEmptyString, @@ -44,7 +44,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - + virtual ~wxButton(); // ------------------------------------------------------------------------ @@ -61,4 +61,5 @@ public: wxSize DoGetBestSize() const; }; -#endif // __WX_COCOA_BUTTON_H__ +#endif + // __WX_COCOA_BUTTON_H__ diff --git a/include/wx/cocoa/control.h b/include/wx/cocoa/control.h index d34e85c5d7..ce13947692 100644 --- a/include/wx/cocoa/control.h +++ b/include/wx/cocoa/control.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_CONTROL_H__ @@ -53,7 +53,7 @@ public: // -------------------------- void OnEraseBackground(wxEraseEvent& event); - + virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } // Calls the callback and appropriate event handlers @@ -65,4 +65,5 @@ protected: virtual wxSize DoGetBestSize() const; }; -#endif // __WX_COCOA_CONTROL_H__ +#endif + // __WX_COCOA_CONTROL_H__ diff --git a/include/wx/cocoa/cursor.h b/include/wx/cocoa/cursor.h index fc59048635..523c90b439 100644 --- a/include/wx/cocoa/cursor.h +++ b/include/wx/cocoa/cursor.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/cocoa/cursor.h // Purpose: wxCursor class // Author: David Elliott // Modified by: // Created: 2002/11/27 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_CURSOR_H_ @@ -17,7 +17,7 @@ class WXDLLEXPORT wxCursorRefData: public wxObjectRefData { DECLARE_NO_COPY_CLASS(wxCursorRefData) - + friend class WXDLLEXPORT wxBitmap; friend class WXDLLEXPORT wxCursor; public: @@ -54,9 +54,9 @@ public: inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; } inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; } - + inline WX_NSCursor GetNSCursor() const - { + { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); } @@ -64,4 +64,5 @@ public: extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); -#endif // _WX_COCOA_CURSOR_H_ +#endif + // _WX_COCOA_CURSOR_H_ diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h index c927f0e5bf..8808210993 100644 --- a/include/wx/cocoa/dcclient.h +++ b/include/wx/cocoa/dcclient.h @@ -6,7 +6,7 @@ // Created: 2003/04/01 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_DCCLIENT_H__ @@ -66,4 +66,5 @@ protected: virtual bool CocoaUnlockFocus(); }; -#endif // __WX_COCOA_DCCLIENT_H__ +#endif + // __WX_COCOA_DCCLIENT_H__ diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h index 6a09f4fb42..e5126c6896 100644 --- a/include/wx/cocoa/dcmemory.h +++ b/include/wx/cocoa/dcmemory.h @@ -6,7 +6,7 @@ // Created: 2003/03/16 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_DCMEMORY_H__ @@ -36,4 +36,5 @@ protected: int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask); }; -#endif // __WX_COCOA_DCMEMORY_H__ +#endif + // __WX_COCOA_DCMEMORY_H__ diff --git a/include/wx/cocoa/gauge.h b/include/wx/cocoa/gauge.h index 1a7e9957f7..eddd47eafc 100644 --- a/include/wx/cocoa/gauge.h +++ b/include/wx/cocoa/gauge.h @@ -6,7 +6,7 @@ // Created: 2003/07/15 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_GAUGE_H__ @@ -70,4 +70,5 @@ protected: virtual wxSize DoGetBestSize() const; }; -#endif // __WX_COCOA_GAUGE_H__ +#endif + // __WX_COCOA_GAUGE_H__ diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h index 760692544e..8e4214f31d 100644 --- a/include/wx/cocoa/icon.h +++ b/include/wx/cocoa/icon.h @@ -6,7 +6,7 @@ // Created: 2003/08/11 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_ICON_H__ @@ -58,4 +58,5 @@ public: bool CreateFromXpm(const char **bits); }; -#endif // _WX_COCOA_ICON_H__ +#endif + // _WX_COCOA_ICON_H__ diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h index c7d48a92a7..20e7ce3d28 100644 --- a/include/wx/cocoa/region.h +++ b/include/wx/cocoa/region.h @@ -2,11 +2,11 @@ // Name: wx/cocoa/region.h // Purpose: wxRegion class // Author: David Elliott -// Modified by: +// Modified by: // Created: 2004/04/12 // RCS-ID: $Id$ // Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_REGION_H__ @@ -68,4 +68,5 @@ public: { return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); } }; -#endif //ndef _WX_COCOA_REGION_H__ +#endif + //ndef _WX_COCOA_REGION_H__ diff --git a/include/wx/cocoa/scrolbar.h b/include/wx/cocoa/scrolbar.h index ca72cb0c20..2ae9935932 100644 --- a/include/wx/cocoa/scrolbar.h +++ b/include/wx/cocoa/scrolbar.h @@ -6,7 +6,7 @@ // Created: 2004/04/25 // RCS-ID: $Id$ // Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_SCROLBAR_H__ @@ -71,4 +71,5 @@ protected: int m_pageSize; }; -#endif // _WX_COCOA_SCROLBAR_H__ +#endif + // _WX_COCOA_SCROLBAR_H__ diff --git a/include/wx/cocoa/slider.h b/include/wx/cocoa/slider.h index e1a9193f03..6c6a482b27 100644 --- a/include/wx/cocoa/slider.h +++ b/include/wx/cocoa/slider.h @@ -6,7 +6,7 @@ // Created: 2003/06/19 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_SLIDER_H__ @@ -79,4 +79,5 @@ public: }; -#endif // __WX_COCOA_SLIDER_H__ +#endif + // __WX_COCOA_SLIDER_H__ diff --git a/include/wx/cocoa/spinbutt.h b/include/wx/cocoa/spinbutt.h index 43c8290b51..fab76435a0 100644 --- a/include/wx/cocoa/spinbutt.h +++ b/include/wx/cocoa/spinbutt.h @@ -6,7 +6,7 @@ // Created: 2003/07/14 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_SPINBUTT_H__ @@ -27,7 +27,7 @@ class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSS // ------------------------------------------------------------------------ public: wxSpinButton() { } - wxSpinButton(wxWindow *parent, wxWindowID winid = -1, + wxSpinButton(wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, @@ -36,7 +36,7 @@ public: Create(parent, winid, pos, size, style, name); } - bool Create(wxWindow *parent, wxWindowID winid = -1, + bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_HORIZONTAL, @@ -60,4 +60,5 @@ public: virtual void SetRange(int minValue, int maxValue); }; -#endif // __WX_COCOA_SPINBUTT_H__ +#endif + // __WX_COCOA_SPINBUTT_H__ diff --git a/include/wx/cocoa/stattext.h b/include/wx/cocoa/stattext.h index e39e083a68..d34bbdac9f 100644 --- a/include/wx/cocoa/stattext.h +++ b/include/wx/cocoa/stattext.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_STATTEXT_H__ @@ -55,4 +55,5 @@ public: void SetLabel(const wxString& label); }; -#endif // __WX_COCOA_STATTEXT_H__ +#endif + // __WX_COCOA_STATTEXT_H__ diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index 5a53a9aadf..b06d3bf7f8 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.h +// Name: wx/gtk/gauge.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GTK_GAUGE_H_ @@ -57,12 +57,12 @@ public: virtual void Pulse(); bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } - + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); virtual wxVisualAttributes GetDefaultAttributes() const; - + // implementation // ------------- @@ -83,4 +83,5 @@ private: DECLARE_DYNAMIC_CLASS(wxGauge) }; -#endif // _WX_GTK_GAUGE_H_ +#endif + // _WX_GTK_GAUGE_H_ diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h index 8d5db66d12..cc00c2fd7c 100644 --- a/include/wx/gtk/menu.h +++ b/include/wx/gtk/menu.h @@ -75,7 +75,7 @@ public: virtual ~wxMenu(); void Attach(wxMenuBarBase *menubar); - + void SetLayoutDirection(const wxLayoutDirection dir); wxLayoutDirection GetLayoutDirection() const; @@ -101,9 +101,10 @@ private: // common part of Append (if pos == -1) and Insert bool GtkAppend(wxMenuItem *item, int pos=-1); - GtkWidget *m_prevRadio; + GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) }; -#endif // __GTKMENUH__ +#endif + // __GTKMENUH__ diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h index 2510336918..42193ac8d1 100644 --- a/include/wx/gtk/stattext.h +++ b/include/wx/gtk/stattext.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.h +// Name: wx/gtk/stattext.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GTK_STATTEXT_H_ @@ -22,7 +22,7 @@ public: wxWindowID id, const wxString &label, const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr ); @@ -30,7 +30,7 @@ public: wxWindowID id, const wxString &label, const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, + const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxStaticTextNameStr ); @@ -42,7 +42,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // see wx/stattext.h void Wrap(int width); @@ -56,10 +56,11 @@ protected: virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - + virtual wxSize DoGetBestSize() const; DECLARE_DYNAMIC_CLASS(wxStaticText) }; -#endif // _WX_GTK_STATTEXT_H_ +#endif + // _WX_GTK_STATTEXT_H_ diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index 8e656daf2b..3e8f8255ab 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKGAUGEH__ @@ -99,4 +99,5 @@ private: #endif -#endif // __GTKGAUGEH__ +#endif + // __GTKGAUGEH__ diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h index afc6828886..f2aef5abb5 100644 --- a/include/wx/gtk1/menu.h +++ b/include/wx/gtk1/menu.h @@ -92,9 +92,10 @@ private: // common part of Append (if pos == -1) and Insert bool GtkAppend(wxMenuItem *item, int pos=-1); - GtkWidget *m_prevRadio; + GtkWidget *m_prevRadio; DECLARE_DYNAMIC_CLASS(wxMenu) }; -#endif // __GTKMENUH__ +#endif + // __GTKMENUH__ diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h index 4c4c110507..d114e7b09e 100644 --- a/include/wx/gtk1/stattext.h +++ b/include/wx/gtk1/stattext.h @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKSTATICTEXTH__ @@ -74,4 +74,5 @@ protected: DECLARE_DYNAMIC_CLASS(wxStaticText) }; -#endif // __GTKSTATICTEXTH__ +#endif + // __GTKSTATICTEXTH__ diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h index 3611b8fe48..f3da49cb9a 100755 --- a/include/wx/html/webkit.h +++ b/include/wx/html/webkit.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: webkit.h +// Name: wx/html/webkit.h // Purpose: wxWebKitCtrl - embeddable web kit control // Author: Jethro Grassie / Kevin Ollivier // Modified by: @@ -63,8 +63,8 @@ public: bool CanGetPageSource(); wxString GetPageSource(); void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString); - wxString GetPageURL(){ return m_currentURL; } - wxString GetPageTitle(){ return m_pageTitle; } + wxString GetPageURL(){ return m_currentURL; } + wxString GetPageTitle(){ return m_pageTitle; } //we need to resize the webview when the control size changes void OnSize(wxSizeEvent &event); @@ -129,4 +129,5 @@ END_DECLARE_EVENT_TYPES() #endif // wxUSE_WEBKIT -#endif // _WX_WEBKIT_H_ +#endif + // _WX_WEBKIT_H_ diff --git a/include/wx/mac/carbon/cursor.h b/include/wx/mac/carbon/cursor.h index 097863c20d..2495246c57 100644 --- a/include/wx/mac/carbon/cursor.h +++ b/include/wx/mac/carbon/cursor.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/mac/carbon/cursor.h // Purpose: wxCursor class // Author: Stefan Csomor // Modified by: @@ -34,7 +34,7 @@ public: wxCursor(int cursor_type); virtual ~wxCursor(); - bool CreateFromXpm(const char **bits) ; + bool CreateFromXpm(const char **bits) ; virtual bool Ok() const { return IsOk(); } virtual bool IsOk() const ; diff --git a/include/wx/mac/carbon/dnd.h b/include/wx/mac/carbon/dnd.h index 3d4676d009..d11389d7d2 100644 --- a/include/wx/mac/carbon/dnd.h +++ b/include/wx/mac/carbon/dnd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.h +// Name: wx/mac/carbon/dnd.h // Purpose: Declaration of the wxDropTarget, wxDropSource class etc. // Author: Stefan Csomor // RCS-ID: $Id$ @@ -55,7 +55,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase virtual bool OnDrop(wxCoord x, wxCoord y); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual bool GetData(); - + bool CurrentDragHasSupportedFormat() ; void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void* GetCurrentDrag() { return m_currentDrag ; } @@ -95,16 +95,14 @@ public: wxWindow* GetWindow() { return m_window ; } void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void* GetCurrentDrag() { return m_currentDrag ; } - bool MacInstallDefaultCursor(wxDragResult effect) ; + bool MacInstallDefaultCursor(wxDragResult effect) ; protected : - + wxWindow *m_window; void* m_currentDrag ; }; -#endif - // D&D - -#endif - //_WX_DND_H_ +#endif // wxUSE_DRAG_AND_DROP +#endif + //_WX_DND_H_ diff --git a/include/wx/mac/carbon/drawer.h b/include/wx/mac/carbon/drawer.h index 95ca484463..e2230aca8c 100644 --- a/include/wx/mac/carbon/drawer.h +++ b/include/wx/mac/carbon/drawer.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: drawer.h +// Name: wx/mac/carbon/drawer.h // Purpose: Drawer child window class. // Drawer windows appear under their parent window and // behave like a drawer, opening and closing to reveal @@ -28,26 +28,26 @@ class WXDLLEXPORT wxDrawerWindow : public wxTopLevelWindow { DECLARE_DYNAMIC_CLASS(wxDrawerWindow) - + public: wxDrawerWindow(); - + wxDrawerWindow(wxWindow* parent, - wxWindowID id, - const wxString& title, - wxSize size = wxDefaultSize, - wxDirection edge = wxLEFT, - const wxString& name = wxT("drawerwindow")) + wxWindowID id, + const wxString& title, + wxSize size = wxDefaultSize, + wxDirection edge = wxLEFT, + const wxString& name = wxT("drawerwindow")) { this->Create(parent, id, title, size, edge, name); } - + virtual ~wxDrawerWindow(); - - // Create a drawer window. + + // Create a drawer window. // If parent is NULL, create as a tool window. - // If parent is not NULL, then wxTopLevelWindow::Attach this window to parent. + // If parent is not NULL, then wxTopLevelWindow::Attach this window to parent. bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -58,13 +58,14 @@ public: bool Open(bool show = true); // open or close the drawer, possibility for async param, i.e. animate bool Close() { return this->Open(false); } bool IsOpen() const; - + // Set the edge of the parent where the drawer attaches. bool SetPreferredEdge(wxDirection edge); wxDirection GetPreferredEdge() const; - wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints + wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints }; #endif // defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 ) -#endif // _WX_DRAWERWINDOW_H_ +#endif + // _WX_DRAWERWINDOW_H_ diff --git a/include/wx/mac/carbon/fontdlg.h b/include/wx/mac/carbon/fontdlg.h index c2fb0706b9..380478bd5c 100644 --- a/include/wx/mac/carbon/fontdlg.h +++ b/include/wx/mac/carbon/fontdlg.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.h -// Purpose: wxFontDialog class using fonts window services (10.2+). +// Name: wx/mac/carbon/fontdlg.h +// Purpose: wxFontDialog class using fonts window services (10.2+). // Author: Ryan Norton // Modified by: // Created: 2004-09-25 @@ -157,11 +157,10 @@ public: protected: wxWindow* m_dialogParent; wxFontData m_fontData; - void* m_pEventHandlerRef; + void* m_pEventHandlerRef; }; #endif #endif // _WX_FONTDLG_H_ - diff --git a/include/wx/mac/carbon/mimetype.h b/include/wx/mac/carbon/mimetype.h index 85d7a58767..26f5cb098b 100644 --- a/include/wx/mac/carbon/mimetype.h +++ b/include/wx/mac/carbon/mimetype.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/mimetype.h +// Name: wx/mac/carbon/mimetype.h // Purpose: Mac Carbon implementation for wx mime-related classes // Author: Ryan Norton // Modified by: @@ -19,11 +19,11 @@ class wxMimeTypesManagerImpl { public : - //kinda kooky but in wxMimeTypesManager::EnsureImpl it doesn't call + //kinda kooky but in wxMimeTypesManager::EnsureImpl it doesn't call //intialize, so we do it ourselves wxMimeTypesManagerImpl() : m_hIC(NULL) { Initialize(); } ~wxMimeTypesManagerImpl() { ClearData(); } - + // load all data into memory - done when it is needed for the first time void Initialize(int mailcapStyles = wxMAILCAP_STANDARD, const wxString& extraDir = wxEmptyString); @@ -48,20 +48,20 @@ public : wxFileType *Associate(const wxFileTypeInfo& ftInfo); // remove association bool Unassociate(wxFileType *ft); - + private: wxArrayFileTypeInfo m_fallbacks; - void* m_hIC; - void** m_hDatabase; - long m_lCount; - + void* m_hIC; + void** m_hDatabase; + long m_lCount; + void* pReserved1; void* pReserved2; void* pReserved3; void* pReserved4; void* pReserved5; void* pReserved6; - + friend class wxFileTypeImpl; }; @@ -71,7 +71,7 @@ public: //kind of nutty, but mimecmn.cpp creates one with an empty new wxFileTypeImpl() : m_manager(NULL) {} ~wxFileTypeImpl() {} //for those broken compilers - + // implement accessor functions bool GetExtensions(wxArrayString& extensions); bool GetMimeType(wxString *mimeType) const; @@ -99,15 +99,15 @@ public: bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0); private: - void Init(wxMimeTypesManagerImpl *manager, long lIndex) + void Init(wxMimeTypesManagerImpl *manager, long lIndex) { m_manager=(manager); m_lIndex=(lIndex); } // helper function wxString GetCommand(const wxString& verb) const; - + wxMimeTypesManagerImpl *m_manager; - long m_lIndex; - + long m_lIndex; + void* pReserved1; void* pReserved2; void* pReserved3; @@ -119,4 +119,4 @@ public: }; #endif - //_MIMETYPE_H + //_MIMETYPE_H diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h index dc3f101780..2f6b0bd510 100644 --- a/include/wx/mac/carbon/private.h +++ b/include/wx/mac/carbon/private.h @@ -785,14 +785,14 @@ protected : Boolean changeValue ) = 0; static pascal Boolean DataBrowserCompareProc( - ControlRef browser, - DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty); - - virtual Boolean CompareItems(DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty) = 0; + ControlRef browser, + DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty); + + virtual Boolean CompareItems(DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty) = 0; }; // ============================================================================ diff --git a/include/wx/mac/carbon/toolbar.h b/include/wx/mac/carbon/toolbar.h index 527c97e793..62c91785e1 100644 --- a/include/wx/mac/carbon/toolbar.h +++ b/include/wx/mac/carbon/toolbar.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: toolbar.h +// Name: wx/mac/carbon/toolbar.h // Purpose: wxToolBar class // Author: Stefan Csomor // Modified by: @@ -93,9 +93,9 @@ protected: virtual wxToolBarToolBase *CreateTool(wxControl *control); DECLARE_EVENT_TABLE() -#if wxMAC_USE_NATIVE_TOOLBAR - bool m_macUsesNativeToolbar ; - void* m_macHIToolbarRef ; +#if wxMAC_USE_NATIVE_TOOLBAR + bool m_macUsesNativeToolbar ; + void* m_macHIToolbarRef ; #endif }; diff --git a/include/wx/mac/classic/cursor.h b/include/wx/mac/classic/cursor.h index 621a7aec0d..c4c0546769 100644 --- a/include/wx/mac/classic/cursor.h +++ b/include/wx/mac/classic/cursor.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/mac/classic/cursor.h // Purpose: wxCursor class // Author: Stefan Csomor // Modified by: @@ -17,7 +17,7 @@ class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData { DECLARE_NO_COPY_CLASS(wxCursorRefData) - + friend class WXDLLEXPORT wxBitmap; friend class WXDLLEXPORT wxCursor; public: @@ -55,7 +55,7 @@ public: wxCursor(int cursor_type); virtual ~wxCursor(); - bool CreateFromXpm(const char **bits) ; + bool CreateFromXpm(const char **bits) ; virtual bool Ok() const { return IsOk(); } virtual bool IsOk() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; } diff --git a/include/wx/mac/classic/dnd.h b/include/wx/mac/classic/dnd.h index 3d4676d009..8aae7f23c8 100644 --- a/include/wx/mac/classic/dnd.h +++ b/include/wx/mac/classic/dnd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.h +// Name: wx/mac/classic/dnd.h // Purpose: Declaration of the wxDropTarget, wxDropSource class etc. // Author: Stefan Csomor // RCS-ID: $Id$ @@ -55,7 +55,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase virtual bool OnDrop(wxCoord x, wxCoord y); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual bool GetData(); - + bool CurrentDragHasSupportedFormat() ; void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void* GetCurrentDrag() { return m_currentDrag ; } @@ -95,16 +95,14 @@ public: wxWindow* GetWindow() { return m_window ; } void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void* GetCurrentDrag() { return m_currentDrag ; } - bool MacInstallDefaultCursor(wxDragResult effect) ; - protected : - + bool MacInstallDefaultCursor(wxDragResult effect) ; +protected : + wxWindow *m_window; void* m_currentDrag ; }; -#endif - // D&D - -#endif - //_WX_DND_H_ +#endif // wxUSE_DRAG_AND_DROP +#endif + //_WX_DND_H_ diff --git a/include/wx/mac/classic/private.h b/include/wx/mac/classic/private.h index 68a28a653f..d82bda0e17 100644 --- a/include/wx/mac/classic/private.h +++ b/include/wx/mac/classic/private.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: private.h +// Name: wx/mac/classic/private.h // Purpose: Private declarations: as this header is only included by // wxWidgets itself, it may contain identifiers which don't start // with "wx". @@ -37,12 +37,12 @@ #include "wx/window.h" -class wxMacPortStateHelper +class wxMacPortStateHelper { DECLARE_NO_COPY_CLASS(wxMacPortStateHelper) - + public: - wxMacPortStateHelper( GrafPtr newport) ; + wxMacPortStateHelper( GrafPtr newport) ; wxMacPortStateHelper() ; ~wxMacPortStateHelper() ; @@ -65,7 +65,7 @@ private: class WXDLLEXPORT wxMacPortSetter { DECLARE_NO_COPY_CLASS(wxMacPortSetter) - + public: wxMacPortSetter( const wxDC* dc ) ; ~wxMacPortSetter() ; @@ -77,7 +77,7 @@ private: class WXDLLEXPORT wxMacWindowClipper { DECLARE_NO_COPY_CLASS(wxMacWindowClipper) - + public: wxMacWindowClipper( const wxWindow* win ) ; ~wxMacWindowClipper() ; @@ -89,7 +89,7 @@ private: class wxMacDrawingHelper { DECLARE_NO_COPY_CLASS(wxMacDrawingHelper) - + public: wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ; ~wxMacDrawingHelper() ; @@ -177,57 +177,57 @@ void wxMacConvertNewlines10To13( wxChar * data ) ; #if TARGET_CARBON -class wxMacCFStringHolder -{ -public: - wxMacCFStringHolder() - { - m_cfs = NULL ; - m_release = false ; - } - - wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding ) - { - m_cfs = NULL ; - m_release = false ; - Assign( str , encoding ) ; - } - - wxMacCFStringHolder(CFStringRef ref , bool release = true ) - { +class wxMacCFStringHolder +{ +public: + wxMacCFStringHolder() + { + m_cfs = NULL ; + m_release = false ; + } + + wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding ) + { + m_cfs = NULL ; + m_release = false ; + Assign( str , encoding ) ; + } + + wxMacCFStringHolder(CFStringRef ref , bool release = true ) + { m_cfs = ref ; - m_release = release ; - } - - ~wxMacCFStringHolder() - { - Release() ; - } + m_release = release ; + } + + ~wxMacCFStringHolder() + { + Release() ; + } CFStringRef Detach() { - CFStringRef retval = m_cfs ; - m_release = false ; - m_cfs = NULL ; - return retval ; - } - + CFStringRef retval = m_cfs ; + m_release = false ; + m_cfs = NULL ; + return retval ; + } + void Release() { - if ( m_release && m_cfs) - CFRelease( m_cfs ) ; - m_cfs = NULL ; - } + if ( m_release && m_cfs) + CFRelease( m_cfs ) ; + m_cfs = NULL ; + } - void Assign( const wxString &str , wxFontEncoding encoding ) ; + void Assign( const wxString &str , wxFontEncoding encoding ) ; - operator CFStringRef () { return m_cfs; } + operator CFStringRef () { return m_cfs; } wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; - -private: - + +private: + CFStringRef m_cfs; - bool m_release ; + bool m_release ; } ; #endif diff --git a/include/wx/mac/classic/private/print.h b/include/wx/mac/classic/private/print.h index d406494902..50af0c5bdf 100644 --- a/include/wx/mac/classic/private/print.h +++ b/include/wx/mac/classic/private/print.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: print.h +// Name: wx/mac/classic/private/print.h // Purpose: private implementation for printing on MacOS // Author: Stefan Csomor // Modified by: // Created: 03/02/99 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -23,7 +23,7 @@ # include "Printing.h" #endif -#if TARGET_CARBON +#if TARGET_CARBON #if !PM_USE_SESSION_APIS #error "only Carbon Printing Session API is supported" #endif @@ -34,48 +34,48 @@ class wxNativePrintData public : wxNativePrintData() {} virtual ~wxNativePrintData() {} - + virtual void TransferFrom( wxPrintData * ) = 0 ; virtual void TransferTo( wxPrintData * ) = 0 ; - + virtual void TransferFrom( wxPageSetupDialogData * ) = 0 ; virtual void TransferTo( wxPageSetupDialogData * ) = 0 ; - + virtual void TransferFrom( wxPrintDialogData * ) = 0 ; virtual void TransferTo( wxPrintDialogData * ) = 0 ; - + virtual void CopyFrom( wxNativePrintData * ) = 0; - + virtual int ShowPrintDialog() = 0 ; virtual int ShowPageSetupDialog() = 0 ; - + static wxNativePrintData* Create() ; } ; #if TARGET_CARBON -class wxMacCarbonPrintData : public wxNativePrintData +class wxMacCarbonPrintData : public wxNativePrintData { public : wxMacCarbonPrintData() ; ~wxMacCarbonPrintData() ; - + virtual void TransferFrom( wxPrintData * ) ; virtual void TransferTo( wxPrintData * ) ; - + virtual void TransferFrom( wxPageSetupDialogData * ) ; virtual void TransferTo( wxPageSetupDialogData * ) ; - + virtual void TransferFrom( wxPrintDialogData * ) ; virtual void TransferTo( wxPrintDialogData * ) ; - + virtual void CopyFrom( wxNativePrintData * ) ; virtual int ShowPrintDialog() ; virtual int ShowPageSetupDialog() ; private : virtual void ValidateOrCreate() ; public : - PMPrintSession m_macPrintSession ; + PMPrintSession m_macPrintSession ; PMPageFormat m_macPageFormat ; PMPrintSettings m_macPrintSettings ; } ; @@ -105,3 +105,4 @@ public : #endif #endif + // _WX_MAC_PRIVATE_PRINT_H_ diff --git a/include/wx/mac/classic/taskbarosx.h b/include/wx/mac/classic/taskbarosx.h index 3cc7f35347..cc8818b808 100644 --- a/include/wx/mac/classic/taskbarosx.h +++ b/include/wx/mac/classic/taskbarosx.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// File: wx/mac/taskbarosx.h +// File: wx/mac/classic/taskbarosx.h // Purpose: Defines wxTaskBarIcon class for OSX // Author: Ryan Norton // Modified by: @@ -18,14 +18,14 @@ class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase { public: - //type of taskbar item to create (currently only DOCK is implemented) - enum wxTaskBarIconType - { - DOCK, - STATUSITEM, - MENUEXTRA - }; - + //type of taskbar item to create (currently only DOCK is implemented) + enum wxTaskBarIconType + { + DOCK, + STATUSITEM, + MENUEXTRA + }; + wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK); virtual ~wxTaskBarIcon(); @@ -36,7 +36,7 @@ public: protected: wxTaskBarIconType m_nType; - + DECLARE_DYNAMIC_CLASS(wxTaskBarIcon) }; diff --git a/include/wx/mac/corefoundation/hid.h b/include/wx/mac/corefoundation/hid.h index 077a4c4435..ec7c09cf08 100644 --- a/include/wx/mac/corefoundation/hid.h +++ b/include/wx/mac/corefoundation/hid.h @@ -91,7 +91,7 @@ protected: wxString m_szProductName; //product name int m_nProductId; //product id int m_nManufacturerId; //manufacturer id - mach_port_t m_pPort; //mach port to use + mach_port_t m_pPort; //mach port to use }; // --------------------------------------------------------------------------- @@ -112,4 +112,5 @@ public: #endif //__DARWIN__ -#endif //WX_MACCARBONHID_H +#endif + // _WX_MACCARBONHID_H_ diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h index 5e60f94c78..ca6a14377f 100644 --- a/include/wx/motif/toolbar.h +++ b/include/wx/motif/toolbar.h @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TOOLBAR_H_ @@ -17,7 +17,7 @@ class WXDLLEXPORT wxToolBar : public wxToolBarBase public: // ctors and dtor wxToolBar() { Init(); } - + wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -26,41 +26,41 @@ public: const wxString& name = wxToolBarNameStr) { Init(); - + Create(parent, id, pos, size, style, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr); - + virtual ~wxToolBar(); - + // override/implement base class virtuals virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; - + virtual bool Realize(); - + // implementation from now on - + // find tool by widget wxToolBarToolBase *FindToolByWidget(WXWidget w) const; - + private: // common part of all ctors void Init(); - + // implement base class pure virtuals virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); - + virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - + virtual wxToolBarToolBase *CreateTool(int id, const wxString& label, const wxBitmap& bmpNormal, @@ -79,4 +79,4 @@ private: }; #endif -// _WX_TOOLBAR_H_ + // _WX_TOOLBAR_H_ diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index ae8f4b055f..7b27e67827 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -190,7 +190,7 @@ typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX; // NMLVCUSTOMDRAW originally didn't have the iSubItem member. It was added // with IE4, as was IPN_FIRST which is used as a test :-(. // -#ifndef IPN_FIRST +#ifndef IPN_FIRST typedef struct wxtagNMLVCUSTOMDRAW_ { NMCUSTOMDRAW nmcd; @@ -202,7 +202,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ { #define NMLVCUSTOMDRAW wxNMLVCUSTOMDRAW_ #define LPNMLVCUSTOMDRAW wxLPNMLVCUSTOMDRAW_ -#endif // defined IPN_FIRST +#endif // defined IPN_FIRST #endif // defined __VISUALC__ && __VISUALC__ <= 1100 diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h index 2b77213b7c..d8a2a08150 100644 --- a/include/wx/os2/helpwin.h +++ b/include/wx/os2/helpwin.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpxxxx.h +// Name: wx/os2/helpwin.h // Purpose: Help system: native implementation for your system. // Author: David Webster // Modified by: -// Created: 10/09/99 +// Created: 10/09/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_HELPWIN_H_ diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h index c8c4bcde7c..69a9a47890 100644 --- a/include/wx/os2/pnghand.h +++ b/include/wx/os2/pnghand.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pnghand.h +// Name: wx/os2/pnghand.h // Purpose: PNG bitmap handler // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Microsoft, Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PNGHAND_H_ @@ -38,5 +38,4 @@ public: }; #endif - // _WX_PNGHAND_H_ - + // _WX_PNGHAND_H_ diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h index 5c46dc9eb7..e66f475a3b 100644 --- a/include/wx/os2/pngread.h +++ b/include/wx/os2/pngread.h @@ -1,9 +1,10 @@ /* - * File: pngread.h - * Purpose: PNG file reader - * Author: Alejandro Aguilar Sierra/Julian Smart - * Created: 1995 - * Copyright: (c) 1995, Alejandro Aguilar Sierra + * File: wx/os2/pngread.h + * Purpose: PNG file reader + * Author: Alejandro Aguilar Sierra/Julian Smart + * Created: 1995 + * RCS-ID: $Id$ + * Copyright: (c) 1995, Alejandro Aguilar Sierra * * */ @@ -21,15 +22,15 @@ typedef byte* ImagePointerType; typedef struct { - byte red; - byte green; - byte blue; + byte red; + byte green; + byte blue; } rgb_color_struct; -#define COLORTYPE_PALETTE 1 -#define COLORTYPE_COLOR 2 -#define COLORTYPE_ALPHA 4 +#define COLORTYPE_PALETTE 1 +#define COLORTYPE_COLOR 2 +#define COLORTYPE_ALPHA 4 class wxPNGReader { @@ -143,7 +144,7 @@ inline wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax) { if (ima) - IterImage = ima->RawImage; + IterImage = ima->RawImage; Itx = Ity = 0; Stepx = Stepy = 0; } @@ -158,9 +159,9 @@ inline bool wxPNGReaderIter::ItOK () { if (ima) - return ima->Inside(Itx, Ity); + return ima->Inside(Itx, Ity); else - return FALSE; + return FALSE; } @@ -206,7 +207,7 @@ inline void wxPNGReaderIter::SetRow(byte *buf, int n) // Here should be bcopy or memcpy //_fmemcpy(IterImage, (void far *)buf, n); if (n<0) - n = ima->GetWidth(); + n = ima->GetWidth(); for (int i=0; im_stopRequested and terminate if it is set to true (it may @@ -158,3 +158,4 @@ public: #endif // wxUSE_SOUND #endif + // _WX_SOUND_H_ \ No newline at end of file diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h index 1fe2ff2955..1b27f36a05 100644 --- a/include/wx/x11/cursor.h +++ b/include/wx/x11/cursor.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.h +// Name: wx/x11/cursor.h // Purpose: wxCursor class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CURSOR_H_ @@ -50,4 +50,4 @@ private: #endif -// _WX_CURSOR_H_ + // _WX_CURSOR_H_ diff --git a/include/wx/x11/dcprint.h b/include/wx/x11/dcprint.h index 74ac920148..1958024e26 100644 --- a/include/wx/x11/dcprint.h +++ b/include/wx/x11/dcprint.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcprint.h +// Name: wx/x11/dcprint.h // Purpose: wxPrinterDC class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DCPRINT_H_ @@ -18,13 +18,12 @@ class WXDLLEXPORT wxPrinterDC: public wxDC { public: DECLARE_CLASS(wxPrinterDC) - + // Create a printer DC wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT); - + virtual ~wxPrinterDC(); }; #endif -// _WX_DCPRINT_H_ - + // _WX_DCPRINT_H_ diff --git a/include/wx/x11/dcscreen.h b/include/wx/x11/dcscreen.h index 1c869312a8..667ea6dcc5 100644 --- a/include/wx/x11/dcscreen.h +++ b/include/wx/x11/dcscreen.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcscreen.h +// Name: wx/x11/dcscreen.h // Purpose: wxScreenDC class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DCSCREEN_H_ @@ -43,5 +43,4 @@ private: #endif -// _WX_DCSCREEN_H_ - + // _WX_DCSCREEN_H_ diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index 2e8a80258c..09152d540d 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/x11/font.h // Purpose: wxFont class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FONT_H_ @@ -110,4 +110,4 @@ private: }; #endif -// _WX_FONT_H_ + // _WX_FONT_H_ diff --git a/include/wx/x11/joystick.h b/include/wx/x11/joystick.h index 81d3c553b5..19d21b69d6 100644 --- a/include/wx/x11/joystick.h +++ b/include/wx/x11/joystick.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: joystick.h +// Name: wx/x11/joystick.h // Purpose: wxJoystick class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_JOYSTICK_H_ @@ -21,12 +21,12 @@ public: /* * Public interface */ - + wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; - + // Attributes //////////////////////////////////////////////////////////////////////////// - + wxPoint GetPosition() const; int GetZPosition() const; int GetButtonState() const; @@ -37,10 +37,10 @@ public: int GetVPosition() const; int GetMovementThreshold() const; void SetMovementThreshold(int threshold) ; - + // Capabilities //////////////////////////////////////////////////////////////////////////// - + bool IsOk() const; // Checks that the joystick is functioning static int GetNumberJoysticks() ; int GetManufacturerId() const ; @@ -64,7 +64,7 @@ public: int GetUMax() const; int GetVMin() const; int GetVMax() const; - + bool HasRudder() const; bool HasZ() const; bool HasU() const; @@ -72,18 +72,18 @@ public: bool HasPOV() const; bool HasPOV4Dir() const; bool HasPOVCTS() const; - + // Operations //////////////////////////////////////////////////////////////////////////// - + // pollingFreq = 0 means that movement events are sent when above the threshold. // If pollingFreq > 0, events are received every this many milliseconds. bool SetCapture(wxWindow* win, int pollingFreq = 0); bool ReleaseCapture(); - + protected: int m_joystick; }; #endif -// _WX_JOYSTICK_H_ + // _WX_JOYSTICK_H_ diff --git a/include/wx/x11/minifram.h b/include/wx/x11/minifram.h index 92b641c996..6d33c4b8b8 100644 --- a/include/wx/x11/minifram.h +++ b/include/wx/x11/minifram.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: minifram.h +// Name: wx/x11/minifram.h // Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars. // If there is no equivalent on your platform, just make it a // normal frame. @@ -8,7 +8,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_MINIFRAM_H_ @@ -17,9 +17,9 @@ #include "wx/frame.h" class WXDLLEXPORT wxMiniFrame: public wxFrame { - + DECLARE_DYNAMIC_CLASS(wxMiniFrame) - + public: inline wxMiniFrame() {} inline wxMiniFrame(wxWindow *parent, @@ -33,10 +33,10 @@ public: // Use wxFrame constructor in absence of more specific code. Create(parent, id, title, pos, size, style, name); } - + virtual ~wxMiniFrame() {} protected: }; #endif -// _WX_MINIFRAM_H_ + // _WX_MINIFRAM_H_ diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h index 66eaab2ed1..f67284c8b5 100644 --- a/include/wx/x11/print.h +++ b/include/wx/x11/print.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: print.h +// Name: wx/x11/print.h // Purpose: wxPrinter, wxPrintPreview classes // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PRINT_H_ @@ -21,11 +21,11 @@ class WXDLLEXPORT wxPrinter: public wxPrinterBase { DECLARE_DYNAMIC_CLASS(wxPrinter) - + public: wxPrinter(wxPrintData *data = NULL); virtual ~wxPrinter(); - + virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE); virtual bool PrintDialog(wxWindow *parent); virtual bool Setup(wxWindow *parent); @@ -39,14 +39,14 @@ public: class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase { DECLARE_CLASS(wxPrintPreview) - + public: wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); virtual ~wxPrintPreview(); - + virtual bool Print(bool interactive); virtual void DetermineScaling(); }; #endif -// _WX_PRINT_H_ + // _WX_PRINT_H_ -- 2.45.2