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__

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

11
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__
@@ -36,7 +36,7 @@ public:
{
Create(parent, winid, label, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID winid,
const wxString& label = wxEmptyString,
@@ -44,7 +44,7 @@ public:
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
virtual ~wxButton();
// ------------------------------------------------------------------------
@@ -61,4 +61,5 @@ public:
wxSize DoGetBestSize() const;
};
#endif // __WX_COCOA_BUTTON_H__
#endif
// __WX_COCOA_BUTTON_H__

9
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__
@@ -53,7 +53,7 @@ public:
// --------------------------
void OnEraseBackground(wxEraseEvent& event);
virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
// Calls the callback and appropriate event handlers
@@ -65,4 +65,5 @@ protected:
virtual wxSize DoGetBestSize() const;
};
#endif // __WX_COCOA_CONTROL_H__
#endif
// __WX_COCOA_CONTROL_H__

15
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_
@@ -17,7 +17,7 @@
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
{
DECLARE_NO_COPY_CLASS(wxCursorRefData)
friend class WXDLLEXPORT wxBitmap;
friend class WXDLLEXPORT wxCursor;
public:
@@ -54,9 +54,9 @@ public:
inline bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
inline bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
inline WX_NSCursor GetNSCursor() const
{
{
return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0);
}
@@ -64,4 +64,5 @@ public:
extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
#endif // _WX_COCOA_CURSOR_H_
#endif
// _WX_COCOA_CURSOR_H_

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__

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

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

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__