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
// 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__

7
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
// 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__
@@ -155,4 +155,5 @@ class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
};
#endif // __WX_COCOA_BITMAP_H__
#endif
// __WX_COCOA_BITMAP_H__

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

@@ -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__
@@ -61,4 +61,5 @@ public:
wxSize DoGetBestSize() const;
};
#endif // __WX_COCOA_BUTTON_H__
#endif
// __WX_COCOA_BUTTON_H__

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

@@ -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__
@@ -65,4 +65,5 @@ protected:
virtual wxSize DoGetBestSize() const;
};
#endif // __WX_COCOA_CONTROL_H__
#endif
// __WX_COCOA_CONTROL_H__

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

@@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: cursor.h
// Name: wx/cocoa/cursor.h
// Purpose: wxCursor class
// Author: David Elliott <dfe@cox.net>
// 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_
@@ -64,4 +64,5 @@ public:
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
// 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__

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

@@ -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__

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

@@ -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__

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

@@ -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__

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

@@ -6,7 +6,7 @@
// 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__

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

@@ -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__

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

@@ -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__

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

@@ -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__

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

@@ -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__

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

@@ -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_
@@ -83,4 +83,5 @@ private:
DECLARE_DYNAMIC_CLASS(wxGauge)
};
#endif // _WX_GTK_GAUGE_H_
#endif
// _WX_GTK_GAUGE_H_

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

@@ -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__

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

@@ -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_
@@ -62,4 +62,5 @@ protected:
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
// 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__

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

@@ -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__

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

@@ -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__

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
// 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_

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
// 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 ;

10
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.
// Author: Stefan Csomor
// RCS-ID: $Id$
@@ -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 // wxUSE_DRAG_AND_DROP
#endif
//_WX_DND_H_
//_WX_DND_H_

17
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.
// Drawer windows appear under their parent window and
// behave like a drawer, opening and closing to reveal
@@ -34,11 +34,11 @@ 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);
}
@@ -62,9 +62,10 @@ public:
// 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_

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

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

10
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
// Author: Ryan Norton
// Modified by:
@@ -51,9 +51,9 @@ public :
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;
@@ -119,4 +119,4 @@ public:
};
#endif
//_MIMETYPE_H
//_MIMETYPE_H

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

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

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

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

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

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: cursor.h
// Name: wx/mac/classic/cursor.h
// Purpose: wxCursor class
// Author: Stefan Csomor
// Modified by:
@@ -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 ) ) ; }

12
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.
// Author: Stefan Csomor
// RCS-ID: $Id$
@@ -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 // wxUSE_DRAG_AND_DROP
#endif
//_WX_DND_H_
//_WX_DND_H_

36
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
// wxWidgets itself, it may contain identifiers which don't start
// with "wx".
@@ -180,17 +180,17 @@ void wxMacConvertNewlines10To13( wxChar * data ) ;
class wxMacCFStringHolder
{
public:
wxMacCFStringHolder()
{
m_cfs = NULL ;
m_release = false ;
}
wxMacCFStringHolder()
{
m_cfs = NULL ;
m_release = false ;
}
wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
{
m_cfs = NULL ;
m_release = false ;
Assign( str , encoding ) ;
m_cfs = NULL ;
m_release = false ;
Assign( str , encoding ) ;
}
wxMacCFStringHolder(CFStringRef ref , bool release = true )
@@ -201,25 +201,25 @@ public:
~wxMacCFStringHolder()
{
Release() ;
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; }
wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

7
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
// Author: Stefan Csomor
// Modified by:
// Created: 03/02/99
// RCS-ID: $Id:
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@ public :
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_

16
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
// Author: Ryan Norton
// Modified by:
@@ -18,13 +18,13 @@ 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();

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

@@ -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_

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

@@ -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_
@@ -79,4 +79,4 @@ private:
};
#endif
// _WX_TOOLBAR_H_
// _WX_TOOLBAR_H_

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.
// 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_

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

@@ -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_

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

@@ -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 <asierra@servidor.unam.mx>
* 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 <asierra@servidor.unam.mx>
*
*
*/
@@ -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; i<n; i++) IterImage[i] = buf[i];
}
@@ -284,4 +285,4 @@ inline bool wxPNGReaderIter::PrevStep()
}
#endif
// _WX_PNGREAD__

62
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
// Author: Julian Smart
// Modified by:
@@ -50,53 +50,53 @@ protected:
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 );
/// Output paragraph formatting
/// Output paragraph formatting
virtual void OutputParagraphFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream/*, bool start*/);
/// Converts an image to its base64 equivalent
void Image_to_Base64(wxRichTextImage* image, wxOutputStream& stream);
/// Converts an image to its base64 equivalent
void Image_to_Base64(wxRichTextImage* image, wxOutputStream& stream);
/// Builds required indentation
void Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Builds required indentation
void Indent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Left indent
void LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Left indent
void LIndent( const wxTextAttrEx& thisStyle, wxTextOutputStream& str );
/// Converts from pt to size property compatible height
long Pt_To_Size(long size);
/// Converts from pt to size property compatible height
long Pt_To_Size(long size);
/// Typical base64 encoder
wxChar* b64enc( unsigned char* input, size_t in_len );
/// Typical base64 encoder
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);
/// Gets the html equivalent of the specified value
wxString GetAlignment( const wxTextAttrEx& thisStyle );
/// Gets the html equivalent of the specified value
wxString GetAlignment( const wxTextAttrEx& thisStyle );
/// Generates &nbsp; array for indentations
wxString SymbolicIndent(long indent);
/// Generates &nbsp; array for indentations
wxString SymbolicIndent(long indent);
/// Finds the html equivalent of the specified bullet
void TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag );
/// 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 );
/// 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;
/// Indentation values of the table tags
wxArrayInt m_indents;
/// Horizontal position of the current table
long m_indent;
/// Horizontal position of the current table
long m_indent;
/// Is there any opened font tag
bool m_font;
/// Is there any opened font tag
bool m_font;
/// Is there any opened ul/ol tag
bool m_list;
/// Is there any opened ul/ol tag
bool m_list;
/// type of list, ul or ol?
bool m_is_ul;
/// 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
// Author: Guilhem Lavaux
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __JOYSTICKH__
@@ -92,5 +92,4 @@ protected:
};
#endif
// __JOYSTICKH__
// __JOYSTICKH__

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

@@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: sound.h
// Name: wx/unix/sound.h
// Purpose: wxSound class
// Author: Julian Smart, Vaclav Slavik
// Modified by:
// Created: 25/10/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Vaclav Slavik
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_SOUND_H_
@@ -158,3 +158,4 @@ public:
#endif // wxUSE_SOUND
#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
// 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_

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

@@ -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_
@@ -26,5 +26,4 @@ public:
};
#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
// 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_

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

@@ -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_

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

@@ -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_
@@ -86,4 +86,4 @@ protected:
};
#endif
// _WX_JOYSTICK_H_
// _WX_JOYSTICK_H_

6
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.
// 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_
@@ -39,4 +39,4 @@ protected:
};
#endif
// _WX_MINIFRAM_H_
// _WX_MINIFRAM_H_

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

@@ -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_
@@ -49,4 +49,4 @@ public:
};
#endif
// _WX_PRINT_H_
// _WX_PRINT_H_