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

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 ;

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.
// Author: Stefan Csomor
// RCS-ID: $Id$
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
virtual bool OnDrop(wxCoord x, wxCoord y);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
virtual bool GetData();
bool CurrentDragHasSupportedFormat() ;
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; }
@@ -95,16 +95,14 @@ public:
wxWindow* GetWindow() { return m_window ; }
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; }
bool MacInstallDefaultCursor(wxDragResult effect) ;
bool MacInstallDefaultCursor(wxDragResult effect) ;
protected :
wxWindow *m_window;
void* m_currentDrag ;
};
#endif // wxUSE_DRAG_AND_DROP
#endif
// D&D
#endif
//_WX_DND_H_
//_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.
// Drawer windows appear under their parent window and
// behave like a drawer, opening and closing to reveal
@@ -28,26 +28,26 @@
class WXDLLEXPORT wxDrawerWindow : public wxTopLevelWindow
{
DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
public:
wxDrawerWindow();
wxDrawerWindow(wxWindow* parent,
wxWindowID id,
const wxString& title,
wxSize size = wxDefaultSize,
wxDirection edge = wxLEFT,
const wxString& name = wxT("drawerwindow"))
wxWindowID id,
const wxString& title,
wxSize size = wxDefaultSize,
wxDirection edge = wxLEFT,
const wxString& name = wxT("drawerwindow"))
{
this->Create(parent, id, title, size, edge, name);
}
virtual ~wxDrawerWindow();
// Create a drawer window.
// Create a drawer window.
// If parent is NULL, create as a tool window.
// If parent is not NULL, then wxTopLevelWindow::Attach this window to parent.
// If parent is not NULL, then wxTopLevelWindow::Attach this window to parent.
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
@@ -58,13 +58,14 @@ public:
bool Open(bool show = true); // open or close the drawer, possibility for async param, i.e. animate
bool Close() { return this->Open(false); }
bool IsOpen() const;
// Set the edge of the parent where the drawer attaches.
bool SetPreferredEdge(wxDirection edge);
wxDirection GetPreferredEdge() const;
wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints
wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints
};
#endif // defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
#endif // _WX_DRAWERWINDOW_H_
#endif
// _WX_DRAWERWINDOW_H_

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

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

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

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

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
// Author: Stefan Csomor
// Modified by:
@@ -93,9 +93,9 @@ protected:
virtual wxToolBarToolBase *CreateTool(wxControl *control);
DECLARE_EVENT_TABLE()
#if wxMAC_USE_NATIVE_TOOLBAR
bool m_macUsesNativeToolbar ;
void* m_macHIToolbarRef ;
#if wxMAC_USE_NATIVE_TOOLBAR
bool m_macUsesNativeToolbar ;
void* m_macHIToolbarRef ;
#endif
};

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

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.
// Author: Stefan Csomor
// RCS-ID: $Id$
@@ -55,7 +55,7 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
virtual bool OnDrop(wxCoord x, wxCoord y);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
virtual bool GetData();
bool CurrentDragHasSupportedFormat() ;
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; }
@@ -95,16 +95,14 @@ public:
wxWindow* GetWindow() { return m_window ; }
void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
void* GetCurrentDrag() { return m_currentDrag ; }
bool MacInstallDefaultCursor(wxDragResult effect) ;
protected :
bool MacInstallDefaultCursor(wxDragResult effect) ;
protected :
wxWindow *m_window;
void* m_currentDrag ;
};
#endif // wxUSE_DRAG_AND_DROP
#endif
// D&D
#endif
//_WX_DND_H_
//_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
// wxWidgets itself, it may contain identifiers which don't start
// with "wx".
@@ -37,12 +37,12 @@
#include "wx/window.h"
class wxMacPortStateHelper
class wxMacPortStateHelper
{
DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)
public:
wxMacPortStateHelper( GrafPtr newport) ;
wxMacPortStateHelper( GrafPtr newport) ;
wxMacPortStateHelper() ;
~wxMacPortStateHelper() ;
@@ -65,7 +65,7 @@ private:
class WXDLLEXPORT wxMacPortSetter
{
DECLARE_NO_COPY_CLASS(wxMacPortSetter)
public:
wxMacPortSetter( const wxDC* dc ) ;
~wxMacPortSetter() ;
@@ -77,7 +77,7 @@ private:
class WXDLLEXPORT wxMacWindowClipper
{
DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
public:
wxMacWindowClipper( const wxWindow* win ) ;
~wxMacWindowClipper() ;
@@ -89,7 +89,7 @@ private:
class wxMacDrawingHelper
{
DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)
public:
wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false ) ;
~wxMacDrawingHelper() ;
@@ -177,57 +177,57 @@ void wxMacConvertNewlines10To13( wxChar * data ) ;
#if TARGET_CARBON
class wxMacCFStringHolder
{
public:
wxMacCFStringHolder()
{
m_cfs = NULL ;
m_release = false ;
}
wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
{
m_cfs = NULL ;
m_release = false ;
Assign( str , encoding ) ;
}
wxMacCFStringHolder(CFStringRef ref , bool release = true )
{
class wxMacCFStringHolder
{
public:
wxMacCFStringHolder()
{
m_cfs = NULL ;
m_release = false ;
}
wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
{
m_cfs = NULL ;
m_release = false ;
Assign( str , encoding ) ;
}
wxMacCFStringHolder(CFStringRef ref , bool release = true )
{
m_cfs = ref ;
m_release = release ;
}
~wxMacCFStringHolder()
{
Release() ;
}
m_release = release ;
}
~wxMacCFStringHolder()
{
Release() ;
}
CFStringRef Detach()
{
CFStringRef retval = m_cfs ;
m_release = false ;
m_cfs = NULL ;
return retval ;
}
CFStringRef retval = m_cfs ;
m_release = false ;
m_cfs = NULL ;
return retval ;
}
void Release()
{
if ( m_release && m_cfs)
CFRelease( m_cfs ) ;
m_cfs = NULL ;
}
if ( m_release && m_cfs)
CFRelease( m_cfs ) ;
m_cfs = NULL ;
}
void Assign( const wxString &str , wxFontEncoding encoding ) ;
void Assign( const wxString &str , wxFontEncoding encoding ) ;
operator CFStringRef () { return m_cfs; }
operator CFStringRef () { return m_cfs; }
wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
private:
private:
CFStringRef m_cfs;
bool m_release ;
bool m_release ;
} ;
#endif

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

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
// Author: Ryan Norton
// Modified by:
@@ -18,14 +18,14 @@ class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
{
public:
//type of taskbar item to create (currently only DOCK is implemented)
enum wxTaskBarIconType
{
DOCK,
STATUSITEM,
MENUEXTRA
};
//type of taskbar item to create (currently only DOCK is implemented)
enum wxTaskBarIconType
{
DOCK,
STATUSITEM,
MENUEXTRA
};
wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
virtual ~wxTaskBarIcon();
@@ -36,7 +36,7 @@ public:
protected:
wxTaskBarIconType m_nType;
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
};

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_