projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AUI under wxOS2 build fixes.
[wxWidgets.git]
/
include
/
wx
/
palmos
/
bitmap.h
diff --git
a/include/wx/palmos/bitmap.h
b/include/wx/palmos/bitmap.h
index f4f92cdc925de3340f1dd73d0a34e8c9983fa5d0..076784bc5a87cafc3f915fc38d781da15095f9f8 100644
(file)
--- a/
include/wx/palmos/bitmap.h
+++ b/
include/wx/palmos/bitmap.h
@@
-1,10
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/palmos/bitmap.h
// Purpose: wxBitmap class
/////////////////////////////////////////////////////////////////////////////
// Name: wx/palmos/bitmap.h
// Purpose: wxBitmap class
-// Author: William Osborne
+// Author: William Osborne
- minimal working wxPalmOS port
// Modified by:
// Created: 10/13/04
// Modified by:
// Created: 10/13/04
-// RCS-ID: $Id
:
+// RCS-ID: $Id
$
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) William Osborne
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-12,10
+12,6
@@
#ifndef _WX_BITMAP_H_
#define _WX_BITMAP_H_
#ifndef _WX_BITMAP_H_
#define _WX_BITMAP_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "bitmap.h"
-#endif
-
#include "wx/palmos/gdiimage.h"
#include "wx/gdicmn.h"
#include "wx/palette.h"
#include "wx/palmos/gdiimage.h"
#include "wx/gdicmn.h"
#include "wx/palette.h"
@@
-45,9
+41,6
@@
public:
// default ctor creates an invalid bitmap, you must Create() it later
wxBitmap() { Init(); }
// default ctor creates an invalid bitmap, you must Create() it later
wxBitmap() { Init(); }
- // Copy constructors
- wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
-
// Initialize with raw data
wxBitmap(const char bits[], int width, int height, int depth = 1);
// Initialize with raw data
wxBitmap(const char bits[], int width, int height, int depth = 1);
@@
-85,13
+78,6
@@
public:
// the copy ctor but the resulting bitmap is invalid!
wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); }
// the copy ctor but the resulting bitmap is invalid!
wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); }
- wxBitmap& operator=(const wxBitmap& bitmap)
- {
- if ( m_refData != bitmap.m_refData )
- Ref(bitmap);
- return *this;
- }
-
wxBitmap& operator=(const wxIcon& icon)
{
(void)CopyFromIcon(icon);
wxBitmap& operator=(const wxIcon& icon)
{
(void)CopyFromIcon(icon);