Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Headers cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-10-17 14:44:52 +00:00
parent 082cfe55b9
commit 1b88201ff5
49 changed files with 371 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/cocoa/NSView.h
View File

@@ -4,7 +4,7 @@
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/02/15 // Created: 2003/02/15
// RCS-ID: $Id: // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@ protected:
static void *sm_cocoaObserver; static void *sm_cocoaObserver;
public: public:
virtual wxWindow* GetWxWindow() const virtual wxWindow* GetWxWindow() const
{ return NULL; } { return NULL; }
virtual void Cocoa_FrameChanged(void) = 0; virtual void Cocoa_FrameChanged(void) = 0;
virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent) virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
{ return false; } { return false; }
@@ -61,8 +61,9 @@ public:
virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent) virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent)
{ return false; } { return false; }
virtual bool Cocoa_resetCursorRects() virtual bool Cocoa_resetCursorRects()
{ return false; } { return false; }
virtual ~wxCocoaNSView() { } virtual ~wxCocoaNSView() { }
}; };
#endif // _WX_COCOA_NSVIEW_H_ #endif
// __WX_COCOA_NSVIEW_H__

11
include/wx/cocoa/bitmap.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: include/wx/cocoa/bitmap.h // Name: wx/cocoa/bitmap.h
// Purpose: wxBitmap class // Purpose: wxBitmap class
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/07/19 // Created: 2003/07/19
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_BITMAP_H__ #ifndef __WX_COCOA_BITMAP_H__
@@ -86,7 +86,7 @@ public:
// destructor // destructor
virtual ~wxBitmap(); virtual ~wxBitmap();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Implementation // Implementation
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@@ -131,7 +131,7 @@ public:
void SetMask(wxMask *mask) ; void SetMask(wxMask *mask) ;
int GetBitmapType() const; int GetBitmapType() const;
inline bool operator == (const wxBitmap& bitmap) const inline bool operator == (const wxBitmap& bitmap) const
{ return m_refData == bitmap.m_refData; } { return m_refData == bitmap.m_refData; }
inline bool operator != (const wxBitmap& bitmap) const inline bool operator != (const wxBitmap& bitmap) const
@@ -155,4 +155,5 @@ class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
DECLARE_ABSTRACT_CLASS(wxBitmapHandler) DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
}; };
#endif // __WX_COCOA_BITMAP_H__ #endif
// __WX_COCOA_BITMAP_H__

11
include/wx/cocoa/button.h
View File

@@ -4,9 +4,9 @@
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2002/12/29 // Created: 2002/12/29
// RCS-ID: $Id: // RCS-ID: $Id$
// Copyright: (c) 2002 David Elliott // Copyright: (c) 2002 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_BUTTON_H__ #ifndef __WX_COCOA_BUTTON_H__
@@ -36,7 +36,7 @@ public:
{ {
Create(parent, winid, label, pos, size, style, validator, name); Create(parent, winid, label, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, wxWindowID winid, bool Create(wxWindow *parent, wxWindowID winid,
const wxString& label = wxEmptyString, const wxString& label = wxEmptyString,
@@ -44,7 +44,7 @@ public:
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
virtual ~wxButton(); virtual ~wxButton();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@@ -61,4 +61,5 @@ public:
wxSize DoGetBestSize() const; wxSize DoGetBestSize() const;
}; };
#endif // __WX_COCOA_BUTTON_H__ #endif
// __WX_COCOA_BUTTON_H__

9
include/wx/cocoa/control.h
View File

@@ -4,9 +4,9 @@
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/02/15 // Created: 2003/02/15
// RCS-ID: $Id: // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_CONTROL_H__ #ifndef __WX_COCOA_CONTROL_H__
@@ -53,7 +53,7 @@ public:
// -------------------------- // --------------------------
void OnEraseBackground(wxEraseEvent& event); void OnEraseBackground(wxEraseEvent& event);
virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
// Calls the callback and appropriate event handlers // Calls the callback and appropriate event handlers
@@ -65,4 +65,5 @@ protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
}; };
#endif // __WX_COCOA_CONTROL_H__ #endif
// __WX_COCOA_CONTROL_H__

15
include/wx/cocoa/cursor.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: cursor.h // Name: wx/cocoa/cursor.h
// Purpose: wxCursor class // Purpose: wxCursor class
// Author: David Elliott <dfe@cox.net> // Author: David Elliott <dfe@cox.net>
// Modified by: // Modified by:
// Created: 2002/11/27 // Created: 2002/11/27
// RCS-ID: // RCS-ID: $Id$
// Copyright: (c) David Elliott // Copyright: (c) David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_CURSOR_H_ #ifndef _WX_COCOA_CURSOR_H_
@@ -17,7 +17,7 @@
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
{ {
DECLARE_NO_COPY_CLASS(wxCursorRefData) DECLARE_NO_COPY_CLASS(wxCursorRefData)
friend class WXDLLEXPORT wxBitmap; friend class WXDLLEXPORT wxBitmap;
friend class WXDLLEXPORT wxCursor; friend class WXDLLEXPORT wxCursor;
public: 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 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 inline WX_NSCursor GetNSCursor() const
{ {
return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
} }
@@ -64,4 +64,5 @@ public:
extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor); extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
#endif // _WX_COCOA_CURSOR_H_ #endif
// _WX_COCOA_CURSOR_H_

5
include/wx/cocoa/dcclient.h
View File

@@ -6,7 +6,7 @@
// Created: 2003/04/01 // Created: 2003/04/01
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_DCCLIENT_H__ #ifndef __WX_COCOA_DCCLIENT_H__
@@ -66,4 +66,5 @@ protected:
virtual bool CocoaUnlockFocus(); virtual bool CocoaUnlockFocus();
}; };
#endif // __WX_COCOA_DCCLIENT_H__ #endif
// __WX_COCOA_DCCLIENT_H__

5
include/wx/cocoa/dcmemory.h
View File

@@ -6,7 +6,7 @@
// Created: 2003/03/16 // Created: 2003/03/16
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_DCMEMORY_H__ #ifndef __WX_COCOA_DCMEMORY_H__
@@ -36,4 +36,5 @@ protected:
int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask); int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask);
}; };
#endif // __WX_COCOA_DCMEMORY_H__ #endif
// __WX_COCOA_DCMEMORY_H__

5
include/wx/cocoa/gauge.h
View File

@@ -6,7 +6,7 @@
// Created: 2003/07/15 // Created: 2003/07/15
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_GAUGE_H__ #ifndef __WX_COCOA_GAUGE_H__
@@ -70,4 +70,5 @@ protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
}; };
#endif // __WX_COCOA_GAUGE_H__ #endif
// __WX_COCOA_GAUGE_H__

5
include/wx/cocoa/icon.h
View File

@@ -6,7 +6,7 @@
// Created: 2003/08/11 // Created: 2003/08/11
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_ICON_H__ #ifndef _WX_COCOA_ICON_H__
@@ -58,4 +58,5 @@ public:
bool CreateFromXpm(const char **bits); bool CreateFromXpm(const char **bits);
}; };
#endif // _WX_COCOA_ICON_H__ #endif
// _WX_COCOA_ICON_H__

7
include/wx/cocoa/region.h
View File

@@ -2,11 +2,11 @@
// Name: wx/cocoa/region.h // Name: wx/cocoa/region.h
// Purpose: wxRegion class // Purpose: wxRegion class
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2004/04/12 // Created: 2004/04/12
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2004 David Elliott // Copyright: (c) 2004 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_REGION_H__ #ifndef _WX_COCOA_REGION_H__
@@ -68,4 +68,5 @@ public:
{ return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); } { return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }
}; };
#endif //ndef _WX_COCOA_REGION_H__ #endif
//ndef _WX_COCOA_REGION_H__

5
include/wx/cocoa/scrolbar.h
View File

@@ -6,7 +6,7 @@
// Created: 2004/04/25 // Created: 2004/04/25
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2004 David Elliott // Copyright: (c) 2004 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_SCROLBAR_H__ #ifndef _WX_COCOA_SCROLBAR_H__
@@ -71,4 +71,5 @@ protected:
int m_pageSize; int m_pageSize;
}; };
#endif // _WX_COCOA_SCROLBAR_H__ #endif
// _WX_COCOA_SCROLBAR_H__

5
include/wx/cocoa/slider.h
View File

@@ -6,7 +6,7 @@
// Created: 2003/06/19 // Created: 2003/06/19
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_SLIDER_H__ #ifndef __WX_COCOA_SLIDER_H__
@@ -79,4 +79,5 @@ public:
}; };
#endif // __WX_COCOA_SLIDER_H__ #endif
// __WX_COCOA_SLIDER_H__

9
include/wx/cocoa/spinbutt.h
View File

@@ -6,7 +6,7 @@
// Created: 2003/07/14 // Created: 2003/07/14
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_SPINBUTT_H__ #ifndef __WX_COCOA_SPINBUTT_H__
@@ -27,7 +27,7 @@ class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSS
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
public: public:
wxSpinButton() { } wxSpinButton() { }
wxSpinButton(wxWindow *parent, wxWindowID winid = -1, wxSpinButton(wxWindow *parent, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
@@ -36,7 +36,7 @@ public:
Create(parent, winid, pos, size, style, name); 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 wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSP_HORIZONTAL, long style = wxSP_HORIZONTAL,
@@ -60,4 +60,5 @@ public:
virtual void SetRange(int minValue, int maxValue); virtual void SetRange(int minValue, int maxValue);
}; };
#endif // __WX_COCOA_SPINBUTT_H__ #endif
// __WX_COCOA_SPINBUTT_H__

7
include/wx/cocoa/stattext.h
View File

@@ -4,9 +4,9 @@
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/02/15 // Created: 2003/02/15
// RCS-ID: $Id: // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATTEXT_H__ #ifndef __WX_COCOA_STATTEXT_H__
@@ -55,4 +55,5 @@ public:
void SetLabel(const wxString& label); void SetLabel(const wxString& label);
}; };
#endif // __WX_COCOA_STATTEXT_H__ #endif
// __WX_COCOA_STATTEXT_H__

11
include/wx/gtk/gauge.h
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gauge.h // Name: wx/gtk/gauge.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GTK_GAUGE_H_ #ifndef _WX_GTK_GAUGE_H_
@@ -57,12 +57,12 @@ public:
virtual void Pulse(); virtual void Pulse();
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
virtual wxVisualAttributes GetDefaultAttributes() const; virtual wxVisualAttributes GetDefaultAttributes() const;
// implementation // implementation
// ------------- // -------------
@@ -83,4 +83,5 @@ private:
DECLARE_DYNAMIC_CLASS(wxGauge) DECLARE_DYNAMIC_CLASS(wxGauge)
}; };
#endif // _WX_GTK_GAUGE_H_ #endif
// _WX_GTK_GAUGE_H_

7
include/wx/gtk/menu.h
View File

@@ -75,7 +75,7 @@ public:
virtual ~wxMenu(); virtual ~wxMenu();
void Attach(wxMenuBarBase *menubar); void Attach(wxMenuBarBase *menubar);
void SetLayoutDirection(const wxLayoutDirection dir); void SetLayoutDirection(const wxLayoutDirection dir);
wxLayoutDirection GetLayoutDirection() const; wxLayoutDirection GetLayoutDirection() const;
@@ -101,9 +101,10 @@ private:
// common part of Append (if pos == -1) and Insert // common part of Append (if pos == -1) and Insert
bool GtkAppend(wxMenuItem *item, int pos=-1); bool GtkAppend(wxMenuItem *item, int pos=-1);
GtkWidget *m_prevRadio; GtkWidget *m_prevRadio;
DECLARE_DYNAMIC_CLASS(wxMenu) DECLARE_DYNAMIC_CLASS(wxMenu)
}; };
#endif // __GTKMENUH__ #endif
// __GTKMENUH__

15
include/wx/gtk/stattext.h
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: stattext.h // Name: wx/gtk/stattext.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GTK_STATTEXT_H_ #ifndef _WX_GTK_STATTEXT_H_
@@ -22,7 +22,7 @@ public:
wxWindowID id, wxWindowID id,
const wxString &label, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticTextNameStr ); const wxString &name = wxStaticTextNameStr );
@@ -30,7 +30,7 @@ public:
wxWindowID id, wxWindowID id,
const wxString &label, const wxString &label,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = 0, long style = 0,
const wxString &name = wxStaticTextNameStr ); const wxString &name = wxStaticTextNameStr );
@@ -42,7 +42,7 @@ public:
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// see wx/stattext.h // see wx/stattext.h
void Wrap(int width); void Wrap(int width);
@@ -56,10 +56,11 @@ protected:
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO);
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
DECLARE_DYNAMIC_CLASS(wxStaticText) DECLARE_DYNAMIC_CLASS(wxStaticText)
}; };
#endif // _WX_GTK_STATTEXT_H_ #endif
// _WX_GTK_STATTEXT_H_

5
include/wx/gtk1/gauge.h
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __GTKGAUGEH__ #ifndef __GTKGAUGEH__
@@ -99,4 +99,5 @@ private:
#endif #endif
#endif // __GTKGAUGEH__ #endif
// __GTKGAUGEH__

5
include/wx/gtk1/menu.h
View File

@@ -92,9 +92,10 @@ private:
// common part of Append (if pos == -1) and Insert // common part of Append (if pos == -1) and Insert
bool GtkAppend(wxMenuItem *item, int pos=-1); bool GtkAppend(wxMenuItem *item, int pos=-1);
GtkWidget *m_prevRadio; GtkWidget *m_prevRadio;
DECLARE_DYNAMIC_CLASS(wxMenu) DECLARE_DYNAMIC_CLASS(wxMenu)
}; };
#endif // __GTKMENUH__ #endif
// __GTKMENUH__

5
include/wx/gtk1/stattext.h
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __GTKSTATICTEXTH__ #ifndef __GTKSTATICTEXTH__
@@ -74,4 +74,5 @@ protected:
DECLARE_DYNAMIC_CLASS(wxStaticText) DECLARE_DYNAMIC_CLASS(wxStaticText)
}; };
#endif // __GTKSTATICTEXTH__ #endif
// __GTKSTATICTEXTH__

9
include/wx/html/webkit.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: webkit.h // Name: wx/html/webkit.h
// Purpose: wxWebKitCtrl - embeddable web kit control // Purpose: wxWebKitCtrl - embeddable web kit control
// Author: Jethro Grassie / Kevin Ollivier // Author: Jethro Grassie / Kevin Ollivier
// Modified by: // Modified by:
@@ -63,8 +63,8 @@ public:
bool CanGetPageSource(); bool CanGetPageSource();
wxString GetPageSource(); wxString GetPageSource();
void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString); void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);
wxString GetPageURL(){ return m_currentURL; } wxString GetPageURL(){ return m_currentURL; }
wxString GetPageTitle(){ return m_pageTitle; } wxString GetPageTitle(){ return m_pageTitle; }
//we need to resize the webview when the control size changes //we need to resize the webview when the control size changes
void OnSize(wxSizeEvent &event); void OnSize(wxSizeEvent &event);
@@ -129,4 +129,5 @@ END_DECLARE_EVENT_TYPES()
#endif // wxUSE_WEBKIT #endif // wxUSE_WEBKIT
#endif // _WX_WEBKIT_H_ #endif
// _WX_WEBKIT_H_

4
include/wx/mac/carbon/cursor.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: cursor.h // Name: wx/mac/carbon/cursor.h
// Purpose: wxCursor class // Purpose: wxCursor class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -34,7 +34,7 @@ public:
wxCursor(int cursor_type); wxCursor(int cursor_type);
virtual ~wxCursor(); virtual ~wxCursor();
bool CreateFromXpm(const char **bits) ; bool CreateFromXpm(const char **bits) ;
virtual bool Ok() const { return IsOk(); } virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const ; virtual bool IsOk() const ;

16
include/wx/mac/carbon/dnd.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: dnd.h // Name: wx/mac/carbon/dnd.h
// Purpose: Declaration of the wxDropTarget, wxDropSource class etc. // Purpose: Declaration of the wxDropTarget, wxDropSource class etc.
// Author: Stefan Csomor // Author: Stefan Csomor
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
virtual bool OnDrop(wxCoord x, wxCoord y); virtual bool OnDrop(wxCoord x, wxCoord y);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
virtual bool GetData(); virtual bool GetData();
bool CurrentDragHasSupportedFormat() ; bool CurrentDragHasSupportedFormat() ;
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; } void* GetCurrentDrag() { return m_currentDrag ; }
@@ -95,16 +95,14 @@ public:
wxWindow* GetWindow() { return m_window ; } wxWindow* GetWindow() { return m_window ; }
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; } void* GetCurrentDrag() { return m_currentDrag ; }
bool MacInstallDefaultCursor(wxDragResult effect) ; bool MacInstallDefaultCursor(wxDragResult effect) ;
protected : protected :
wxWindow *m_window; wxWindow *m_window;
void* m_currentDrag ; void* m_currentDrag ;
}; };
#endif // wxUSE_DRAG_AND_DROP
#endif #endif
// D&D //_WX_DND_H_
#endif
//_WX_DND_H_

31
include/wx/mac/carbon/drawer.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: drawer.h // Name: wx/mac/carbon/drawer.h
// Purpose: Drawer child window class. // Purpose: Drawer child window class.
// Drawer windows appear under their parent window and // Drawer windows appear under their parent window and
// behave like a drawer, opening and closing to reveal // behave like a drawer, opening and closing to reveal
@@ -28,26 +28,26 @@
class WXDLLEXPORT wxDrawerWindow : public wxTopLevelWindow class WXDLLEXPORT wxDrawerWindow : public wxTopLevelWindow
{ {
DECLARE_DYNAMIC_CLASS(wxDrawerWindow) DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
public: public:
wxDrawerWindow(); wxDrawerWindow();
wxDrawerWindow(wxWindow* parent, wxDrawerWindow(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
wxSize size = wxDefaultSize, wxSize size = wxDefaultSize,
wxDirection edge = wxLEFT, wxDirection edge = wxLEFT,
const wxString& name = wxT("drawerwindow")) const wxString& name = wxT("drawerwindow"))
{ {
this->Create(parent, id, title, size, edge, name); this->Create(parent, id, title, size, edge, name);
} }
virtual ~wxDrawerWindow(); virtual ~wxDrawerWindow();
// Create a drawer window. // Create a drawer window.
// If parent is NULL, create as a tool 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, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& title, 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 Open(bool show = true); // open or close the drawer, possibility for async param, i.e. animate
bool Close() { return this->Open(false); } bool Close() { return this->Open(false); }
bool IsOpen() const; bool IsOpen() const;
// Set the edge of the parent where the drawer attaches. // Set the edge of the parent where the drawer attaches.
bool SetPreferredEdge(wxDirection edge); bool SetPreferredEdge(wxDirection edge);
wxDirection GetPreferredEdge() const; 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 // 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_

7
include/wx/mac/carbon/fontdlg.h
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: fontdlg.h // Name: wx/mac/carbon/fontdlg.h
// Purpose: wxFontDialog class using fonts window services (10.2+). // Purpose: wxFontDialog class using fonts window services (10.2+).
// Author: Ryan Norton // Author: Ryan Norton
// Modified by: // Modified by:
// Created: 2004-09-25 // Created: 2004-09-25
@@ -157,11 +157,10 @@ public:
protected: protected:
wxWindow* m_dialogParent; wxWindow* m_dialogParent;
wxFontData m_fontData; wxFontData m_fontData;
void* m_pEventHandlerRef; void* m_pEventHandlerRef;
}; };
#endif #endif
#endif #endif
// _WX_FONTDLG_H_ // _WX_FONTDLG_H_

30
include/wx/mac/carbon/mimetype.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/mac/mimetype.h // Name: wx/mac/carbon/mimetype.h
// Purpose: Mac Carbon implementation for wx mime-related classes // Purpose: Mac Carbon implementation for wx mime-related classes
// Author: Ryan Norton // Author: Ryan Norton
// Modified by: // Modified by:
@@ -19,11 +19,11 @@
class wxMimeTypesManagerImpl class wxMimeTypesManagerImpl
{ {
public : 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 //intialize, so we do it ourselves
wxMimeTypesManagerImpl() : m_hIC(NULL) { Initialize(); } wxMimeTypesManagerImpl() : m_hIC(NULL) { Initialize(); }
~wxMimeTypesManagerImpl() { ClearData(); } ~wxMimeTypesManagerImpl() { ClearData(); }
// load all data into memory - done when it is needed for the first time // load all data into memory - done when it is needed for the first time
void Initialize(int mailcapStyles = wxMAILCAP_STANDARD, void Initialize(int mailcapStyles = wxMAILCAP_STANDARD,
const wxString& extraDir = wxEmptyString); const wxString& extraDir = wxEmptyString);
@@ -48,20 +48,20 @@ public :
wxFileType *Associate(const wxFileTypeInfo& ftInfo); wxFileType *Associate(const wxFileTypeInfo& ftInfo);
// remove association // remove association
bool Unassociate(wxFileType *ft); bool Unassociate(wxFileType *ft);
private: private:
wxArrayFileTypeInfo m_fallbacks; wxArrayFileTypeInfo m_fallbacks;
void* m_hIC; void* m_hIC;
void** m_hDatabase; void** m_hDatabase;
long m_lCount; long m_lCount;
void* pReserved1; void* pReserved1;
void* pReserved2; void* pReserved2;
void* pReserved3; void* pReserved3;
void* pReserved4; void* pReserved4;
void* pReserved5; void* pReserved5;
void* pReserved6; void* pReserved6;
friend class wxFileTypeImpl; friend class wxFileTypeImpl;
}; };
@@ -71,7 +71,7 @@ public:
//kind of nutty, but mimecmn.cpp creates one with an empty new //kind of nutty, but mimecmn.cpp creates one with an empty new
wxFileTypeImpl() : m_manager(NULL) {} wxFileTypeImpl() : m_manager(NULL) {}
~wxFileTypeImpl() {} //for those broken compilers ~wxFileTypeImpl() {} //for those broken compilers
// implement accessor functions // implement accessor functions
bool GetExtensions(wxArrayString& extensions); bool GetExtensions(wxArrayString& extensions);
bool GetMimeType(wxString *mimeType) const; bool GetMimeType(wxString *mimeType) const;
@@ -99,15 +99,15 @@ public:
bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0); bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0);
private: private:
void Init(wxMimeTypesManagerImpl *manager, long lIndex) void Init(wxMimeTypesManagerImpl *manager, long lIndex)
{ m_manager=(manager); m_lIndex=(lIndex); } { m_manager=(manager); m_lIndex=(lIndex); }
// helper function // helper function
wxString GetCommand(const wxString& verb) const; wxString GetCommand(const wxString& verb) const;
wxMimeTypesManagerImpl *m_manager; wxMimeTypesManagerImpl *m_manager;
long m_lIndex; long m_lIndex;
void* pReserved1; void* pReserved1;
void* pReserved2; void* pReserved2;
void* pReserved3; void* pReserved3;
@@ -119,4 +119,4 @@ public:
}; };
#endif #endif
//_MIMETYPE_H //_MIMETYPE_H

14
include/wx/mac/carbon/private.h
View File

@@ -785,14 +785,14 @@ protected :
Boolean changeValue ) = 0; Boolean changeValue ) = 0;
static pascal Boolean DataBrowserCompareProc( static pascal Boolean DataBrowserCompareProc(
ControlRef browser, ControlRef browser,
DataBrowserItemID itemOneID, DataBrowserItemID itemOneID,
DataBrowserItemID itemTwoID, DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty); DataBrowserPropertyID sortProperty);
virtual Boolean CompareItems(DataBrowserItemID itemOneID, virtual Boolean CompareItems(DataBrowserItemID itemOneID,
DataBrowserItemID itemTwoID, DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty) = 0; DataBrowserPropertyID sortProperty) = 0;
}; };
// ============================================================================ // ============================================================================

8
include/wx/mac/carbon/toolbar.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: toolbar.h // Name: wx/mac/carbon/toolbar.h
// Purpose: wxToolBar class // Purpose: wxToolBar class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -93,9 +93,9 @@ protected:
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR
bool m_macUsesNativeToolbar ; bool m_macUsesNativeToolbar ;
void* m_macHIToolbarRef ; void* m_macHIToolbarRef ;
#endif #endif
}; };

6
include/wx/mac/classic/cursor.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: cursor.h // Name: wx/mac/classic/cursor.h
// Purpose: wxCursor class // Purpose: wxCursor class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -17,7 +17,7 @@
class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
{ {
DECLARE_NO_COPY_CLASS(wxCursorRefData) DECLARE_NO_COPY_CLASS(wxCursorRefData)
friend class WXDLLEXPORT wxBitmap; friend class WXDLLEXPORT wxBitmap;
friend class WXDLLEXPORT wxCursor; friend class WXDLLEXPORT wxCursor;
public: public:
@@ -55,7 +55,7 @@ public:
wxCursor(int cursor_type); wxCursor(int cursor_type);
virtual ~wxCursor(); virtual ~wxCursor();
bool CreateFromXpm(const char **bits) ; bool CreateFromXpm(const char **bits) ;
virtual bool Ok() const { return IsOk(); } virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; } virtual bool IsOk() const { return (m_refData != NULL && ( M_CURSORDATA->m_hCursor != NULL || M_CURSORDATA->m_themeCursor != -1 ) ) ; }

18
include/wx/mac/classic/dnd.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: dnd.h // Name: wx/mac/classic/dnd.h
// Purpose: Declaration of the wxDropTarget, wxDropSource class etc. // Purpose: Declaration of the wxDropTarget, wxDropSource class etc.
// Author: Stefan Csomor // Author: Stefan Csomor
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
virtual bool OnDrop(wxCoord x, wxCoord y); virtual bool OnDrop(wxCoord x, wxCoord y);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
virtual bool GetData(); virtual bool GetData();
bool CurrentDragHasSupportedFormat() ; bool CurrentDragHasSupportedFormat() ;
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; } void* GetCurrentDrag() { return m_currentDrag ; }
@@ -95,16 +95,14 @@ public:
wxWindow* GetWindow() { return m_window ; } wxWindow* GetWindow() { return m_window ; }
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; } void* GetCurrentDrag() { return m_currentDrag ; }
bool MacInstallDefaultCursor(wxDragResult effect) ; bool MacInstallDefaultCursor(wxDragResult effect) ;
protected : protected :
wxWindow *m_window; wxWindow *m_window;
void* m_currentDrag ; void* m_currentDrag ;
}; };
#endif // wxUSE_DRAG_AND_DROP
#endif #endif
// D&D //_WX_DND_H_
#endif
//_WX_DND_H_

96
include/wx/mac/classic/private.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: private.h // Name: wx/mac/classic/private.h
// Purpose: Private declarations: as this header is only included by // Purpose: Private declarations: as this header is only included by
// wxWidgets itself, it may contain identifiers which don't start // wxWidgets itself, it may contain identifiers which don't start
// with "wx". // with "wx".
@@ -37,12 +37,12 @@
#include "wx/window.h" #include "wx/window.h"
class wxMacPortStateHelper class wxMacPortStateHelper
{ {
DECLARE_NO_COPY_CLASS(wxMacPortStateHelper) DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)
public: public:
wxMacPortStateHelper( GrafPtr newport) ; wxMacPortStateHelper( GrafPtr newport) ;
wxMacPortStateHelper() ; wxMacPortStateHelper() ;
~wxMacPortStateHelper() ; ~wxMacPortStateHelper() ;
@@ -65,7 +65,7 @@ private:
class WXDLLEXPORT wxMacPortSetter class WXDLLEXPORT wxMacPortSetter
{ {
DECLARE_NO_COPY_CLASS(wxMacPortSetter) DECLARE_NO_COPY_CLASS(wxMacPortSetter)
public: public:
wxMacPortSetter( const wxDC* dc ) ; wxMacPortSetter( const wxDC* dc ) ;
~wxMacPortSetter() ; ~wxMacPortSetter() ;
@@ -77,7 +77,7 @@ private:
class WXDLLEXPORT wxMacWindowClipper class WXDLLEXPORT wxMacWindowClipper
{ {
DECLARE_NO_COPY_CLASS(wxMacWindowClipper) DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
public: public:
wxMacWindowClipper( const wxWindow* win ) ; wxMacWindowClipper( const wxWindow* win ) ;
~wxMacWindowClipper() ; ~wxMacWindowClipper() ;
@@ -89,7 +89,7 @@ private:
class wxMacDrawingHelper class wxMacDrawingHelper
{ {
DECLARE_NO_COPY_CLASS(wxMacDrawingHelper) DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)
public: public:
wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ; wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
~wxMacDrawingHelper() ; ~wxMacDrawingHelper() ;
@@ -177,57 +177,57 @@ void wxMacConvertNewlines10To13( wxChar * data ) ;
#if TARGET_CARBON #if TARGET_CARBON
class wxMacCFStringHolder class wxMacCFStringHolder
{ {
public: public:
wxMacCFStringHolder() wxMacCFStringHolder()
{ {
m_cfs = NULL ; m_cfs = NULL ;
m_release = false ; m_release = false ;
} }
wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding ) wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
{ {
m_cfs = NULL ; m_cfs = NULL ;
m_release = false ; m_release = false ;
Assign( str , encoding ) ; Assign( str , encoding ) ;
} }
wxMacCFStringHolder(CFStringRef ref , bool release = true ) wxMacCFStringHolder(CFStringRef ref , bool release = true )
{ {
m_cfs = ref ; m_cfs = ref ;
m_release = release ; m_release = release ;
} }
~wxMacCFStringHolder() ~wxMacCFStringHolder()
{ {
Release() ; Release() ;
} }
CFStringRef Detach() CFStringRef Detach()
{ {
CFStringRef retval = m_cfs ; CFStringRef retval = m_cfs ;
m_release = false ; m_release = false ;
m_cfs = NULL ; m_cfs = NULL ;
return retval ; return retval ;
} }
void Release() void Release()
{ {
if ( m_release && m_cfs) if ( m_release && m_cfs)
CFRelease( m_cfs ) ; CFRelease( m_cfs ) ;
m_cfs = NULL ; 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 ) ; wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
private: private:
CFStringRef m_cfs; CFStringRef m_cfs;
bool m_release ; bool m_release ;
} ; } ;
#endif #endif

31
include/wx/mac/classic/private/print.h
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: print.h // Name: wx/mac/classic/private/print.h
// Purpose: private implementation for printing on MacOS // Purpose: private implementation for printing on MacOS
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 03/02/99 // Created: 03/02/99
// RCS-ID: $Id: // RCS-ID: $Id$
// Copyright: (c) Stefan Csomor // Copyright: (c) Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -23,7 +23,7 @@
# include "Printing.h" # include "Printing.h"
#endif #endif
#if TARGET_CARBON #if TARGET_CARBON
#if !PM_USE_SESSION_APIS #if !PM_USE_SESSION_APIS
#error "only Carbon Printing Session API is supported" #error "only Carbon Printing Session API is supported"
#endif #endif
@@ -34,48 +34,48 @@ class wxNativePrintData
public : public :
wxNativePrintData() {} wxNativePrintData() {}
virtual ~wxNativePrintData() {} virtual ~wxNativePrintData() {}
virtual void TransferFrom( wxPrintData * ) = 0 ; virtual void TransferFrom( wxPrintData * ) = 0 ;
virtual void TransferTo( wxPrintData * ) = 0 ; virtual void TransferTo( wxPrintData * ) = 0 ;
virtual void TransferFrom( wxPageSetupDialogData * ) = 0 ; virtual void TransferFrom( wxPageSetupDialogData * ) = 0 ;
virtual void TransferTo( wxPageSetupDialogData * ) = 0 ; virtual void TransferTo( wxPageSetupDialogData * ) = 0 ;
virtual void TransferFrom( wxPrintDialogData * ) = 0 ; virtual void TransferFrom( wxPrintDialogData * ) = 0 ;
virtual void TransferTo( wxPrintDialogData * ) = 0 ; virtual void TransferTo( wxPrintDialogData * ) = 0 ;
virtual void CopyFrom( wxNativePrintData * ) = 0; virtual void CopyFrom( wxNativePrintData * ) = 0;
virtual int ShowPrintDialog() = 0 ; virtual int ShowPrintDialog() = 0 ;
virtual int ShowPageSetupDialog() = 0 ; virtual int ShowPageSetupDialog() = 0 ;
static wxNativePrintData* Create() ; static wxNativePrintData* Create() ;
} ; } ;
#if TARGET_CARBON #if TARGET_CARBON
class wxMacCarbonPrintData : public wxNativePrintData class wxMacCarbonPrintData : public wxNativePrintData
{ {
public : public :
wxMacCarbonPrintData() ; wxMacCarbonPrintData() ;
~wxMacCarbonPrintData() ; ~wxMacCarbonPrintData() ;
virtual void TransferFrom( wxPrintData * ) ; virtual void TransferFrom( wxPrintData * ) ;
virtual void TransferTo( wxPrintData * ) ; virtual void TransferTo( wxPrintData * ) ;
virtual void TransferFrom( wxPageSetupDialogData * ) ; virtual void TransferFrom( wxPageSetupDialogData * ) ;
virtual void TransferTo( wxPageSetupDialogData * ) ; virtual void TransferTo( wxPageSetupDialogData * ) ;
virtual void TransferFrom( wxPrintDialogData * ) ; virtual void TransferFrom( wxPrintDialogData * ) ;
virtual void TransferTo( wxPrintDialogData * ) ; virtual void TransferTo( wxPrintDialogData * ) ;
virtual void CopyFrom( wxNativePrintData * ) ; virtual void CopyFrom( wxNativePrintData * ) ;
virtual int ShowPrintDialog() ; virtual int ShowPrintDialog() ;
virtual int ShowPageSetupDialog() ; virtual int ShowPageSetupDialog() ;
private : private :
virtual void ValidateOrCreate() ; virtual void ValidateOrCreate() ;
public : public :
PMPrintSession m_macPrintSession ; PMPrintSession m_macPrintSession ;
PMPageFormat m_macPageFormat ; PMPageFormat m_macPageFormat ;
PMPrintSettings m_macPrintSettings ; PMPrintSettings m_macPrintSettings ;
} ; } ;
@@ -105,3 +105,4 @@ public :
#endif #endif
#endif #endif
// _WX_MAC_PRIVATE_PRINT_H_

20
include/wx/mac/classic/taskbarosx.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// File: wx/mac/taskbarosx.h // File: wx/mac/classic/taskbarosx.h
// Purpose: Defines wxTaskBarIcon class for OSX // Purpose: Defines wxTaskBarIcon class for OSX
// Author: Ryan Norton // Author: Ryan Norton
// Modified by: // Modified by:
@@ -18,14 +18,14 @@ class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
{ {
public: public:
//type of taskbar item to create (currently only DOCK is implemented) //type of taskbar item to create (currently only DOCK is implemented)
enum wxTaskBarIconType enum wxTaskBarIconType
{ {
DOCK, DOCK,
STATUSITEM, STATUSITEM,
MENUEXTRA MENUEXTRA
}; };
wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK); wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
virtual ~wxTaskBarIcon(); virtual ~wxTaskBarIcon();
@@ -36,7 +36,7 @@ public:
protected: protected:
wxTaskBarIconType m_nType; wxTaskBarIconType m_nType;
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon) DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
}; };

5
include/wx/mac/corefoundation/hid.h
View File

@@ -91,7 +91,7 @@ protected:
wxString m_szProductName; //product name wxString m_szProductName; //product name
int m_nProductId; //product id int m_nProductId; //product id
int m_nManufacturerId; //manufacturer 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 //__DARWIN__
#endif //WX_MACCARBONHID_H #endif
// _WX_MACCARBONHID_H_

28
include/wx/motif/toolbar.h
View File

@@ -6,7 +6,7 @@
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_TOOLBAR_H_ #ifndef _WX_TOOLBAR_H_
@@ -17,7 +17,7 @@ class WXDLLEXPORT wxToolBar : public wxToolBarBase
public: public:
// ctors and dtor // ctors and dtor
wxToolBar() { Init(); } wxToolBar() { Init(); }
wxToolBar(wxWindow *parent, wxToolBar(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -26,41 +26,41 @@ public:
const wxString& name = wxToolBarNameStr) const wxString& name = wxToolBarNameStr)
{ {
Init(); Init();
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
} }
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL, long style = wxNO_BORDER | wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual ~wxToolBar(); virtual ~wxToolBar();
// override/implement base class virtuals // override/implement base class virtuals
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
virtual bool Realize(); virtual bool Realize();
// implementation from now on // implementation from now on
// find tool by widget // find tool by widget
wxToolBarToolBase *FindToolByWidget(WXWidget w) const; wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
private: private:
// common part of all ctors // common part of all ctors
void Init(); void Init();
// implement base class pure virtuals // implement base class pure virtuals
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
virtual wxToolBarToolBase *CreateTool(int id, virtual wxToolBarToolBase *CreateTool(int id,
const wxString& label, const wxString& label,
const wxBitmap& bmpNormal, const wxBitmap& bmpNormal,
@@ -79,4 +79,4 @@ private:
}; };
#endif #endif
// _WX_TOOLBAR_H_ // _WX_TOOLBAR_H_

4
include/wx/msw/missing.h
View File

@@ -190,7 +190,7 @@ typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
// NMLVCUSTOMDRAW originally didn't have the iSubItem member. It was added // NMLVCUSTOMDRAW originally didn't have the iSubItem member. It was added
// with IE4, as was IPN_FIRST which is used as a test :-(. // with IE4, as was IPN_FIRST which is used as a test :-(.
// //
#ifndef IPN_FIRST #ifndef IPN_FIRST
typedef struct wxtagNMLVCUSTOMDRAW_ { typedef struct wxtagNMLVCUSTOMDRAW_ {
NMCUSTOMDRAW nmcd; NMCUSTOMDRAW nmcd;
@@ -202,7 +202,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
#define NMLVCUSTOMDRAW wxNMLVCUSTOMDRAW_ #define NMLVCUSTOMDRAW wxNMLVCUSTOMDRAW_
#define LPNMLVCUSTOMDRAW wxLPNMLVCUSTOMDRAW_ #define LPNMLVCUSTOMDRAW wxLPNMLVCUSTOMDRAW_
#endif // defined IPN_FIRST #endif // defined IPN_FIRST
#endif // defined __VISUALC__ && __VISUALC__ <= 1100 #endif // defined __VISUALC__ && __VISUALC__ <= 1100

6
include/wx/os2/helpwin.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: helpxxxx.h // Name: wx/os2/helpwin.h
// Purpose: Help system: native implementation for your system. // Purpose: Help system: native implementation for your system.
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:
// Created: 10/09/99 // Created: 10/09/99
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) David Webster // Copyright: (c) David Webster
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_HELPWIN_H_ #ifndef _WX_HELPWIN_H_

7
include/wx/os2/pnghand.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: pnghand.h // Name: wx/os2/pnghand.h
// Purpose: PNG bitmap handler // Purpose: PNG bitmap handler
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 04/01/98 // Created: 04/01/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Microsoft, Julian Smart // Copyright: (c) Microsoft, Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PNGHAND_H_ #ifndef _WX_PNGHAND_H_
@@ -38,5 +38,4 @@ public:
}; };
#endif #endif
// _WX_PNGHAND_H_ // _WX_PNGHAND_H_

33
include/wx/os2/pngread.h
View File

@@ -1,9 +1,10 @@
/* /*
* File: pngread.h * File: wx/os2/pngread.h
* Purpose: PNG file reader * Purpose: PNG file reader
* Author: Alejandro Aguilar Sierra/Julian Smart * Author: Alejandro Aguilar Sierra/Julian Smart
* Created: 1995 * Created: 1995
* Copyright: (c) 1995, Alejandro Aguilar Sierra <asierra@servidor.unam.mx> * RCS-ID: $Id$
* Copyright: (c) 1995, Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
* *
* *
*/ */
@@ -21,15 +22,15 @@ typedef byte* ImagePointerType;
typedef struct typedef struct
{ {
byte red; byte red;
byte green; byte green;
byte blue; byte blue;
} rgb_color_struct; } rgb_color_struct;
#define COLORTYPE_PALETTE 1 #define COLORTYPE_PALETTE 1
#define COLORTYPE_COLOR 2 #define COLORTYPE_COLOR 2
#define COLORTYPE_ALPHA 4 #define COLORTYPE_ALPHA 4
class wxPNGReader class wxPNGReader
{ {
@@ -143,7 +144,7 @@ inline
wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax) wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax)
{ {
if (ima) if (ima)
IterImage = ima->RawImage; IterImage = ima->RawImage;
Itx = Ity = 0; Itx = Ity = 0;
Stepx = Stepy = 0; Stepx = Stepy = 0;
} }
@@ -158,9 +159,9 @@ inline
bool wxPNGReaderIter::ItOK () bool wxPNGReaderIter::ItOK ()
{ {
if (ima) if (ima)
return ima->Inside(Itx, Ity); return ima->Inside(Itx, Ity);
else else
return FALSE; return FALSE;
} }
@@ -206,7 +207,7 @@ inline void wxPNGReaderIter::SetRow(byte *buf, int n)
// Here should be bcopy or memcpy // Here should be bcopy or memcpy
//_fmemcpy(IterImage, (void far *)buf, n); //_fmemcpy(IterImage, (void far *)buf, n);
if (n<0) if (n<0)
n = ima->GetWidth(); n = ima->GetWidth();
for (int i=0; i<n; i++) IterImage[i] = buf[i]; for (int i=0; i<n; i++) IterImage[i] = buf[i];
} }
@@ -284,4 +285,4 @@ inline bool wxPNGReaderIter::PrevStep()
} }
#endif #endif
// _WX_PNGREAD__

86
include/wx/richtext/richtexthtml.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/richtext/richedithtml.h // Name: wx/richtext/richtexthtml.h
// Purpose: HTML I/O for wxRichTextCtrl // Purpose: HTML I/O for wxRichTextCtrl
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -49,54 +49,54 @@ protected:
/// Output character formatting /// Output character formatting
virtual void BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxOutputStream& stream ); virtual void BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxOutputStream& stream );
virtual void EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxOutputStream& stream ); virtual void EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, const wxTextAttrEx& paraStyle, wxOutputStream& stream );
/// Output paragraph formatting /// Output paragraph formatting
virtual void OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream/*, bool start*/); virtual void OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream/*, bool start*/);
/// Converts an image to its base64 equivalent /// Converts an image to its base64 equivalent
void Image_to_Base64(wxRichTextImage* image, wxOutputStream& stream); void Image_to_Base64(wxRichTextImage* image, wxOutputStream& stream);
/// Builds required indentation /// Builds required indentation
void Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str ); void Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Left indent /// Left indent
void LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str ); void LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Converts from pt to size property compatible height /// Converts from pt to size property compatible height
long Pt_To_Size(long size); long Pt_To_Size(long size);
/// Typical base64 encoder /// Typical base64 encoder
wxChar* b64enc( unsigned char* input, size_t in_len ); wxChar* b64enc( unsigned char* input, size_t in_len );
/// Gets the mime type of the given wxBITMAP_TYPE /// Gets the mime type of the given wxBITMAP_TYPE
const wxChar* GetMimeType(int imageType); const wxChar* GetMimeType(int imageType);
/// Gets the html equivalent of the specified value
wxString GetAlignment( const wxTextAttrEx& thisStyle );
/// Generates &nbsp; array for indentations /// Gets the html equivalent of the specified value
wxString SymbolicIndent(long indent); wxString GetAlignment( const wxTextAttrEx& thisStyle );
/// Finds the html equivalent of the specified bullet
void TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag );
/// Closes existings or Opens new tables for navigation to an item's horizontal position.
void NavigateToListPosition( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Indentation values of the table tags
wxArrayInt m_indents;
/// Horizontal position of the current table
long m_indent;
/// Is there any opened font tag /// Generates &nbsp; array for indentations
bool m_font; wxString SymbolicIndent(long indent);
/// Is there any opened ul/ol tag /// Finds the html equivalent of the specified bullet
bool m_list; void TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag );
/// type of list, ul or ol? /// Closes existings or Opens new tables for navigation to an item's horizontal position.
bool m_is_ul; void NavigateToListPosition( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Indentation values of the table tags
wxArrayInt m_indents;
/// Horizontal position of the current table
long m_indent;
/// Is there any opened font tag
bool m_font;
/// Is there any opened ul/ol tag
bool m_list;
/// type of list, ul or ol?
bool m_is_ul;
}; };

7
include/wx/unix/joystick.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: joystick.h // Name: wx/unix/joystick.h
// Purpose: wxJoystick class // Purpose: wxJoystick class
// Author: Guilhem Lavaux // Author: Guilhem Lavaux
// Modified by: // Modified by:
// Created: 01/02/97 // Created: 01/02/97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux // Copyright: (c) Guilhem Lavaux
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __JOYSTICKH__ #ifndef __JOYSTICKH__
@@ -92,5 +92,4 @@ protected:
}; };
#endif #endif
// __JOYSTICKH__ // __JOYSTICKH__

23
include/wx/unix/sound.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: sound.h // Name: wx/unix/sound.h
// Purpose: wxSound class // Purpose: wxSound class
// Author: Julian Smart, Vaclav Slavik // Author: Julian Smart, Vaclav Slavik
// Modified by: // Modified by:
// Created: 25/10/98 // Created: 25/10/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart, Vaclav Slavik // Copyright: (c) Julian Smart, Vaclav Slavik
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_SOUND_H_ #ifndef _WX_SOUND_H_
@@ -33,7 +33,7 @@ public:
wxSoundData() : m_refCnt(1) {} wxSoundData() : m_refCnt(1) {}
void IncRef(); void IncRef();
void DecRef(); void DecRef();
// .wav header information: // .wav header information:
unsigned m_channels; // num of channels (mono:1, stereo:2) unsigned m_channels; // num of channels (mono:1, stereo:2)
unsigned m_samplingRate; unsigned m_samplingRate;
@@ -41,7 +41,7 @@ public:
// samples (wxUint8), if 16 then signed 16bit // samples (wxUint8), if 16 then signed 16bit
// (wxInt16) // (wxInt16)
unsigned m_samples; // length in samples: unsigned m_samples; // length in samples:
// wave data: // wave data:
size_t m_dataBytes; size_t m_dataBytes;
wxUint8 *m_data; // m_dataBytes bytes of data wxUint8 *m_data; // m_dataBytes bytes of data
@@ -69,23 +69,23 @@ public:
bool Create(int size, const wxByte* data); bool Create(int size, const wxByte* data);
bool IsOk() const { return m_data != NULL; } bool IsOk() const { return m_data != NULL; }
// Stop playing any sound // Stop playing any sound
static void Stop(); static void Stop();
// Returns true if a sound is being played // Returns true if a sound is being played
static bool IsPlaying(); static bool IsPlaying();
// for internal use // for internal use
static void UnloadBackend(); static void UnloadBackend();
protected: protected:
bool DoPlay(unsigned flags) const; bool DoPlay(unsigned flags) const;
static void EnsureBackend(); static void EnsureBackend();
void Free(); void Free();
bool LoadWAV(const wxUint8 *data, size_t length, bool copyData); bool LoadWAV(const wxUint8 *data, size_t length, bool copyData);
static wxSoundBackend *ms_backend; static wxSoundBackend *ms_backend;
#if wxUSE_LIBSDL && wxUSE_PLUGINS #if wxUSE_LIBSDL && wxUSE_PLUGINS
// FIXME - temporary, until we have plugins architecture // FIXME - temporary, until we have plugins architecture
@@ -98,7 +98,7 @@ private:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxSoundBackend: // wxSoundBackend:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// This is interface to sound playing implementation. There are multiple // This is interface to sound playing implementation. There are multiple
@@ -121,7 +121,7 @@ class WXDLLIMPEXP_ADV wxSoundBackend
{ {
public: public:
virtual ~wxSoundBackend() {} virtual ~wxSoundBackend() {}
// Returns the name of the backend (e.g. "Open Sound System") // Returns the name of the backend (e.g. "Open Sound System")
virtual wxString GetName() const = 0; virtual wxString GetName() const = 0;
@@ -137,7 +137,7 @@ public:
// playback, otherwise it is left up to the backend (will usually be more // playback, otherwise it is left up to the backend (will usually be more
// effective). // effective).
virtual bool HasNativeAsyncPlayback() const = 0; virtual bool HasNativeAsyncPlayback() const = 0;
// Plays the sound. flags are same flags as those passed to wxSound::Play. // Plays the sound. flags are same flags as those passed to wxSound::Play.
// The function should periodically check the value of // The function should periodically check the value of
// status->m_stopRequested and terminate if it is set to true (it may // status->m_stopRequested and terminate if it is set to true (it may
@@ -158,3 +158,4 @@ public:
#endif // wxUSE_SOUND #endif // wxUSE_SOUND
#endif #endif
// _WX_SOUND_H_

6
include/wx/x11/cursor.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: cursor.h // Name: wx/x11/cursor.h
// Purpose: wxCursor class // Purpose: wxCursor class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CURSOR_H_ #ifndef _WX_CURSOR_H_
@@ -50,4 +50,4 @@ private:
#endif #endif
// _WX_CURSOR_H_ // _WX_CURSOR_H_

11
include/wx/x11/dcprint.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcprint.h // Name: wx/x11/dcprint.h
// Purpose: wxPrinterDC class // Purpose: wxPrinterDC class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DCPRINT_H_ #ifndef _WX_DCPRINT_H_
@@ -18,13 +18,12 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
{ {
public: public:
DECLARE_CLASS(wxPrinterDC) DECLARE_CLASS(wxPrinterDC)
// Create a printer DC // Create a printer DC
wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT); wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
virtual ~wxPrinterDC(); virtual ~wxPrinterDC();
}; };
#endif #endif
// _WX_DCPRINT_H_ // _WX_DCPRINT_H_

7
include/wx/x11/dcscreen.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcscreen.h // Name: wx/x11/dcscreen.h
// Purpose: wxScreenDC class // Purpose: wxScreenDC class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DCSCREEN_H_ #ifndef _WX_DCSCREEN_H_
@@ -43,5 +43,4 @@ private:
#endif #endif
// _WX_DCSCREEN_H_ // _WX_DCSCREEN_H_

6
include/wx/x11/font.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: font.h // Name: wx/x11/font.h
// Purpose: wxFont class // Purpose: wxFont class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FONT_H_ #ifndef _WX_FONT_H_
@@ -110,4 +110,4 @@ private:
}; };
#endif #endif
// _WX_FONT_H_ // _WX_FONT_H_

24
include/wx/x11/joystick.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: joystick.h // Name: wx/x11/joystick.h
// Purpose: wxJoystick class // Purpose: wxJoystick class
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_JOYSTICK_H_ #ifndef _WX_JOYSTICK_H_
@@ -21,12 +21,12 @@ public:
/* /*
* Public interface * Public interface
*/ */
wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
// Attributes // Attributes
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
wxPoint GetPosition() const; wxPoint GetPosition() const;
int GetZPosition() const; int GetZPosition() const;
int GetButtonState() const; int GetButtonState() const;
@@ -37,10 +37,10 @@ public:
int GetVPosition() const; int GetVPosition() const;
int GetMovementThreshold() const; int GetMovementThreshold() const;
void SetMovementThreshold(int threshold) ; void SetMovementThreshold(int threshold) ;
// Capabilities // Capabilities
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
bool IsOk() const; // Checks that the joystick is functioning bool IsOk() const; // Checks that the joystick is functioning
static int GetNumberJoysticks() ; static int GetNumberJoysticks() ;
int GetManufacturerId() const ; int GetManufacturerId() const ;
@@ -64,7 +64,7 @@ public:
int GetUMax() const; int GetUMax() const;
int GetVMin() const; int GetVMin() const;
int GetVMax() const; int GetVMax() const;
bool HasRudder() const; bool HasRudder() const;
bool HasZ() const; bool HasZ() const;
bool HasU() const; bool HasU() const;
@@ -72,18 +72,18 @@ public:
bool HasPOV() const; bool HasPOV() const;
bool HasPOV4Dir() const; bool HasPOV4Dir() const;
bool HasPOVCTS() const; bool HasPOVCTS() const;
// Operations // Operations
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// pollingFreq = 0 means that movement events are sent when above the threshold. // pollingFreq = 0 means that movement events are sent when above the threshold.
// If pollingFreq > 0, events are received every this many milliseconds. // If pollingFreq > 0, events are received every this many milliseconds.
bool SetCapture(wxWindow* win, int pollingFreq = 0); bool SetCapture(wxWindow* win, int pollingFreq = 0);
bool ReleaseCapture(); bool ReleaseCapture();
protected: protected:
int m_joystick; int m_joystick;
}; };
#endif #endif
// _WX_JOYSTICK_H_ // _WX_JOYSTICK_H_

12
include/wx/x11/minifram.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: minifram.h // Name: wx/x11/minifram.h
// Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars. // Purpose: wxMiniFrame class. A small frame for e.g. floating toolbars.
// If there is no equivalent on your platform, just make it a // If there is no equivalent on your platform, just make it a
// normal frame. // normal frame.
@@ -8,7 +8,7 @@
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MINIFRAM_H_ #ifndef _WX_MINIFRAM_H_
@@ -17,9 +17,9 @@
#include "wx/frame.h" #include "wx/frame.h"
class WXDLLEXPORT wxMiniFrame: public wxFrame { class WXDLLEXPORT wxMiniFrame: public wxFrame {
DECLARE_DYNAMIC_CLASS(wxMiniFrame) DECLARE_DYNAMIC_CLASS(wxMiniFrame)
public: public:
inline wxMiniFrame() {} inline wxMiniFrame() {}
inline wxMiniFrame(wxWindow *parent, inline wxMiniFrame(wxWindow *parent,
@@ -33,10 +33,10 @@ public:
// Use wxFrame constructor in absence of more specific code. // Use wxFrame constructor in absence of more specific code.
Create(parent, id, title, pos, size, style, name); Create(parent, id, title, pos, size, style, name);
} }
virtual ~wxMiniFrame() {} virtual ~wxMiniFrame() {}
protected: protected:
}; };
#endif #endif
// _WX_MINIFRAM_H_ // _WX_MINIFRAM_H_

14
include/wx/x11/print.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: print.h // Name: wx/x11/print.h
// Purpose: wxPrinter, wxPrintPreview classes // Purpose: wxPrinter, wxPrintPreview classes
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PRINT_H_ #ifndef _WX_PRINT_H_
@@ -21,11 +21,11 @@
class WXDLLEXPORT wxPrinter: public wxPrinterBase class WXDLLEXPORT wxPrinter: public wxPrinterBase
{ {
DECLARE_DYNAMIC_CLASS(wxPrinter) DECLARE_DYNAMIC_CLASS(wxPrinter)
public: public:
wxPrinter(wxPrintData *data = NULL); wxPrinter(wxPrintData *data = NULL);
virtual ~wxPrinter(); virtual ~wxPrinter();
virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE); virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
virtual bool PrintDialog(wxWindow *parent); virtual bool PrintDialog(wxWindow *parent);
virtual bool Setup(wxWindow *parent); virtual bool Setup(wxWindow *parent);
@@ -39,14 +39,14 @@ public:
class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
{ {
DECLARE_CLASS(wxPrintPreview) DECLARE_CLASS(wxPrintPreview)
public: public:
wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL); wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
virtual ~wxPrintPreview(); virtual ~wxPrintPreview();
virtual bool Print(bool interactive); virtual bool Print(bool interactive);
virtual void DetermineScaling(); virtual void DetermineScaling();
}; };
#endif #endif
// _WX_PRINT_H_ // _WX_PRINT_H_