projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wrong tab order in wxAuiNotebook after dragging.
[wxWidgets.git]
/
include
/
wx
/
univ
/
statbmp.h
diff --git
a/include/wx/univ/statbmp.h
b/include/wx/univ/statbmp.h
index 3dccd9066ce201730fe137ed9b401f50c75a9e0e..2c9e011547fa92366c7172696d4490d32f0fdf0a 100644
(file)
--- a/
include/wx/univ/statbmp.h
+++ b/
include/wx/univ/statbmp.h
@@
-6,23
+6,19
@@
// Created: 25.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
// Created: 25.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_UNIV_STATBMP_H_
#define _WX_UNIV_STATBMP_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_UNIV_STATBMP_H_
#define _WX_UNIV_STATBMP_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "univstatbmp.h"
-#endif
-
#include "wx/bitmap.h"
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
#include "wx/bitmap.h"
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxStaticBitmap : public wxStaticBitmapBase
+class WXDLL
IMPEXP_CORE
wxStaticBitmap : public wxStaticBitmapBase
{
public:
wxStaticBitmap()
{
public:
wxStaticBitmap()
@@
-35,7
+31,7
@@
public:
const wxSize& size = wxDefaultSize,
long style = 0)
{
const wxSize& size = wxDefaultSize,
long style = 0)
{
- Create(parent,
-1
, label, pos, size, style);
+ Create(parent,
wxID_ANY
, label, pos, size, style);
}
wxStaticBitmap(wxWindow *parent,
}
wxStaticBitmap(wxWindow *parent,
@@
-63,11
+59,12
@@
public:
wxIcon GetIcon() const;
wxIcon GetIcon() const;
- virtual bool HasTransparentBackground() { return
TRUE
; }
-
-pr
ivate
:
+ virtual bool HasTransparentBackground() { return
true
; }
+
+pr
otected
:
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer);
+private:
// the bitmap which we show
wxBitmap m_bitmap;
// the bitmap which we show
wxBitmap m_bitmap;