From b698c8e9bfbcf149f8ac375ea5b5ff6af9cba86a Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 30 Jun 2001 10:14:48 +0000 Subject: [PATCH] corrections for Mac OS X after wxUniv merge git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/bitmap.h | 5 +---- include/wx/mac/stattext.h | 4 ---- include/wx/statbmp.h | 6 +++++- src/mac/bitmap.cpp | 9 ++++----- src/mac/carbon/bitmap.cpp | 9 ++++----- src/mac/carbon/checklst.cpp | 4 +++- src/mac/carbon/radiobox.cpp | 3 ++- src/mac/carbon/statbmp.cpp | 2 +- src/mac/checklst.cpp | 4 +++- src/mac/radiobox.cpp | 3 ++- src/mac/statbmp.cpp | 2 +- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h index 9308aca1c3..5f42224be9 100644 --- a/include/wx/mac/bitmap.h +++ b/include/wx/mac/bitmap.h @@ -13,11 +13,9 @@ #define _WX_BITMAP_H_ #ifdef __GNUG__ -#pragma interface "bitmap.h" + #pragma interface "bitmap.h" #endif -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" #include "wx/palette.h" // Bitmap @@ -209,7 +207,6 @@ public: static void InitStandardHandlers(); static void CleanUpHandlers(); protected: - static wxList sm_handlers; // TODO: Implementation public: diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h index 670d12cbf3..45d6e4e326 100644 --- a/include/wx/mac/stattext.h +++ b/include/wx/mac/stattext.h @@ -16,10 +16,6 @@ #pragma interface "stattext.h" #endif -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; - class WXDLLEXPORT wxStaticText: public wxStaticTextBase { DECLARE_DYNAMIC_CLASS(wxStaticText) diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index e673612db0..f741d8b4d0 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -29,7 +29,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl { -public: + public: +#ifdef __WXMAC_X__ + ~wxStaticBitmapBase() { } +#endif + // our interface virtual void SetIcon(const wxIcon& icon) = 0; virtual void SetBitmap(const wxBitmap& bitmap) = 0; diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp index fd0f461f17..409d2fb3a8 100644 --- a/src/mac/bitmap.cpp +++ b/src/mac/bitmap.cpp @@ -10,13 +10,12 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ +#pragma implementation "bitmapbase.h" #pragma implementation "bitmap.h" #endif -#include "wx/wx.h" -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/palette.h" +#include "wx/defs.h" + #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/log.h" @@ -241,7 +240,7 @@ wxBitmapRefData::~wxBitmapRefData() } } -wxList wxBitmap::sm_handlers; +wxList wxBitmapBase::sm_handlers; bool wxBitmap::CopyFromIcon(const wxIcon& icon) diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp index fd0f461f17..409d2fb3a8 100644 --- a/src/mac/carbon/bitmap.cpp +++ b/src/mac/carbon/bitmap.cpp @@ -10,13 +10,12 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ +#pragma implementation "bitmapbase.h" #pragma implementation "bitmap.h" #endif -#include "wx/wx.h" -#include "wx/setup.h" -#include "wx/utils.h" -#include "wx/palette.h" +#include "wx/defs.h" + #include "wx/bitmap.h" #include "wx/icon.h" #include "wx/log.h" @@ -241,7 +240,7 @@ wxBitmapRefData::~wxBitmapRefData() } } -wxList wxBitmap::sm_handlers; +wxList wxBitmapBase::sm_handlers; bool wxBitmap::CopyFromIcon(const wxIcon& icon) diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 2a9d09a8bf..ecf13c8f70 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -17,10 +17,12 @@ #pragma implementation "checklst.h" #endif -#include "wx/checklst.h" +#include "wx/defs.h" #if wxUSE_CHECKLISTBOX +#include "wx/checklst.h" + // ============================================================================ // implementation // ============================================================================ diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp index cafbf2ed98..f2651ba594 100644 --- a/src/mac/carbon/radiobox.cpp +++ b/src/mac/carbon/radiobox.cpp @@ -14,7 +14,8 @@ //------------------------------------------------------------------------------------- #ifdef __GNUG__ -#pragma implementation "radiobox.h" + #pragma implementation "radioboxbase.h" + #pragma implementation "radiobox.h" #endif #include "wx/defs.h" diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp index 1605258450..35e918d469 100644 --- a/src/mac/carbon/statbmp.cpp +++ b/src/mac/carbon/statbmp.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "statbmp.h" + #pragma implementation "statbmp.h" #endif #include "wx/defs.h" diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp index 2a9d09a8bf..ecf13c8f70 100644 --- a/src/mac/checklst.cpp +++ b/src/mac/checklst.cpp @@ -17,10 +17,12 @@ #pragma implementation "checklst.h" #endif -#include "wx/checklst.h" +#include "wx/defs.h" #if wxUSE_CHECKLISTBOX +#include "wx/checklst.h" + // ============================================================================ // implementation // ============================================================================ diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp index cafbf2ed98..f2651ba594 100644 --- a/src/mac/radiobox.cpp +++ b/src/mac/radiobox.cpp @@ -14,7 +14,8 @@ //------------------------------------------------------------------------------------- #ifdef __GNUG__ -#pragma implementation "radiobox.h" + #pragma implementation "radioboxbase.h" + #pragma implementation "radiobox.h" #endif #include "wx/defs.h" diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp index 1605258450..35e918d469 100644 --- a/src/mac/statbmp.cpp +++ b/src/mac/statbmp.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "statbmp.h" + #pragma implementation "statbmp.h" #endif #include "wx/defs.h" -- 2.45.2