Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix uses of wxUSE_METAFILE, patch 1262723 Paul Cornett

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-08-19 13:48:24 +00:00
parent 938ad7687f
commit f2555abd7a
7 changed files with 54 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@@ -5690,6 +5690,17 @@ if test "$wxUSE_PROLOGIO" = "yes" -o "$wxUSE_RESOURCES" = "yes"; then
AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only]) AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only])
fi fi
dnl ---------------------------------------------------------------------------
dnl wxMetafile availability
dnl ---------------------------------------------------------------------------
if test "$wxUSE_METAFILE" = "yes"; then
if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then
AC_MSG_WARN([wxMetafile is not available on this system... disabled])
wxUSE_METAFILE=no
fi
fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl IPC: IPC, Drag'n'Drop, Clipboard, ... dnl IPC: IPC, Drag'n'Drop, Clipboard, ...
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------

4
include/wx/mac/carbon/metafile.h
View File

@@ -15,7 +15,6 @@
#ifndef _WX_METAFIILE_H_ #ifndef _WX_METAFIILE_H_
#define _WX_METAFIILE_H_ #define _WX_METAFIILE_H_
#if wxUSE_METAFILE
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
@@ -149,8 +148,5 @@ protected:
}; };
#endif #endif
#endif // wxUSE_METAFILE
#endif #endif
// _WX_METAFIILE_H_ // _WX_METAFIILE_H_

5
include/wx/metafile.h
View File

@@ -12,6 +12,10 @@
#ifndef _WX_METAFILE_H_BASE_ #ifndef _WX_METAFILE_H_BASE_
#define _WX_METAFILE_H_BASE_ #define _WX_METAFILE_H_BASE_
#include "wx/defs.h"
#if wxUSE_METAFILE
// provide synonyms for all metafile classes // provide synonyms for all metafile classes
#define wxMetaFile wxMetafile #define wxMetaFile wxMetafile
#define wxMetaFileDC wxMetafileDC #define wxMetaFileDC wxMetafileDC
@@ -50,5 +54,6 @@
#include "wx/mac/metafile.h" #include "wx/mac/metafile.h"
#endif #endif
#endif // wxUSE_METAFILE
#endif #endif
// _WX_METAFILE_H_BASE_ // _WX_METAFILE_H_BASE_

5
include/wx/msw/metafile.h
View File

@@ -16,10 +16,6 @@
#pragma interface "metafile.h" #pragma interface "metafile.h"
#endif #endif
#include "wx/setup.h"
#if wxUSE_METAFILE
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
@@ -168,7 +164,6 @@ protected:
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
#endif // wxUSE_METAFILE
#endif #endif
// _WX_METAFIILE_H_ // _WX_METAFIILE_H_

4
include/wx/os2/metafile.h
View File

@@ -15,9 +15,6 @@
#ifndef _WX_METAFIILE_H_ #ifndef _WX_METAFIILE_H_
#define _WX_METAFIILE_H_ #define _WX_METAFIILE_H_
#include "wx/setup.h"
#if wxUSE_METAFILE
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
@@ -195,6 +192,5 @@ private:
}; };
#endif #endif
#endif // wxUSE_METAFILE
#endif #endif
// _WX_METAFIILE_H_ // _WX_METAFIILE_H_

5
include/wx/palmos/metafile.h
View File

@@ -16,10 +16,6 @@
#pragma interface "metafile.h" #pragma interface "metafile.h"
#endif #endif
#include "wx/setup.h"
#if wxUSE_METAFILE
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
@@ -168,7 +164,6 @@ protected:
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
#endif // wxUSE_METAFILE
#endif #endif
// _WX_METAFIILE_H_ // _WX_METAFIILE_H_

86
samples/dnd/dnd.cpp
View File

@@ -19,21 +19,11 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/dnd.h" #include "wx/dnd.h"
#include "wx/dirdlg.h"
#include "wx/filedlg.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include "wx/colordlg.h" #include "wx/colordlg.h"
#include "wx/sizer.h" #include "wx/metafile.h"
#include "wx/dataobj.h"
#if wxUSE_METAFILES
#include "wx/metafile.h"
#endif // wxUSE_METAFILES
#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "../sample.xpm" #include "../sample.xpm"
@@ -163,7 +153,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#if wxUSE_METAFILES #if wxUSE_METAFILE
// and the same thing fo metafiles // and the same thing fo metafiles
class DnDCanvasMetafile : public wxScrolledWindow class DnDCanvasMetafile : public wxScrolledWindow
@@ -181,7 +171,7 @@ public:
Refresh(); Refresh();
} }
void OnPaint(wxPaintEvent& event) void OnPaint(wxPaintEvent&)
{ {
wxPaintDC dc(this); wxPaintDC dc(this);
@@ -199,7 +189,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Define a new frame type for the main frame // Define a new frame type for the main frame
@@ -230,9 +220,9 @@ public:
void OnCopyBitmap(wxCommandEvent& event); void OnCopyBitmap(wxCommandEvent& event);
void OnPasteBitmap(wxCommandEvent& event); void OnPasteBitmap(wxCommandEvent& event);
#if wxUSE_METAFILES #if wxUSE_METAFILE
void OnPasteMetafile(wxCommandEvent& event); void OnPasteMetafile(wxCommandEvent& event);
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
void OnCopyFiles(wxCommandEvent& event); void OnCopyFiles(wxCommandEvent& event);
@@ -494,9 +484,9 @@ public:
// we don't draw the shape to a bitmap until it's really needed (i.e. // we don't draw the shape to a bitmap until it's really needed (i.e.
// we're asked to do so) // we're asked to do so)
m_hasBitmap = false; m_hasBitmap = false;
#if wxUSE_METAFILES #if wxUSE_METAFILE
m_hasMetaFile = false; m_hasMetaFile = false;
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
} }
virtual ~DnDShapeDataObject() { delete m_shape; } virtual ~DnDShapeDataObject() { delete m_shape; }
@@ -513,9 +503,9 @@ public:
m_shape = (DnDShape *)NULL; m_shape = (DnDShape *)NULL;
m_hasBitmap = false; m_hasBitmap = false;
#if wxUSE_METAFILES #if wxUSE_METAFILE
m_hasMetaFile = false; m_hasMetaFile = false;
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
return shape; return shape;
} }
@@ -537,9 +527,9 @@ public:
// but the bitmap format(s) are only supported for output // but the bitmap format(s) are only supported for output
nFormats += m_dobjBitmap.GetFormatCount(dir); nFormats += m_dobjBitmap.GetFormatCount(dir);
#if wxUSE_METAFILES #if wxUSE_METAFILE
nFormats += m_dobjMetaFile.GetFormatCount(dir); nFormats += m_dobjMetaFile.GetFormatCount(dir);
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
} }
return nFormats; return nFormats;
@@ -554,11 +544,11 @@ public:
// under Windows // under Windows
m_dobjBitmap.GetAllFormats(&formats[1], dir); m_dobjBitmap.GetAllFormats(&formats[1], dir);
#if wxUSE_METAFILES #if wxUSE_METAFILE
// don't assume that m_dobjBitmap has only 1 format // don't assume that m_dobjBitmap has only 1 format
m_dobjMetaFile.GetAllFormats(&formats[1 + m_dobjMetaFile.GetAllFormats(&formats[1 +
m_dobjBitmap.GetFormatCount(dir)], dir); m_dobjBitmap.GetFormatCount(dir)], dir);
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
} }
} }
@@ -568,7 +558,7 @@ public:
{ {
return m_shape->GetDataSize(); return m_shape->GetDataSize();
} }
#if wxUSE_METAFILES #if wxUSE_METAFILE
else if ( m_dobjMetaFile.IsSupported(format) ) else if ( m_dobjMetaFile.IsSupported(format) )
{ {
if ( !m_hasMetaFile ) if ( !m_hasMetaFile )
@@ -576,7 +566,7 @@ public:
return m_dobjMetaFile.GetDataSize(format); return m_dobjMetaFile.GetDataSize(format);
} }
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
else else
{ {
wxASSERT_MSG( m_dobjBitmap.IsSupported(format), wxASSERT_MSG( m_dobjBitmap.IsSupported(format),
@@ -597,7 +587,7 @@ public:
return true; return true;
} }
#if wxUSE_METAFILES #if wxUSE_METAFILE
else if ( m_dobjMetaFile.IsSupported(format) ) else if ( m_dobjMetaFile.IsSupported(format) )
{ {
if ( !m_hasMetaFile ) if ( !m_hasMetaFile )
@@ -605,7 +595,7 @@ public:
return m_dobjMetaFile.GetDataHere(format, pBuf); return m_dobjMetaFile.GetDataHere(format, pBuf);
} }
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
else else
{ {
wxASSERT_MSG( m_dobjBitmap.IsSupported(format), wxASSERT_MSG( m_dobjBitmap.IsSupported(format),
@@ -630,9 +620,9 @@ public:
// the shape has changed // the shape has changed
m_hasBitmap = false; m_hasBitmap = false;
#if wxUSE_METAFILES #if wxUSE_METAFILE
m_hasMetaFile = false; m_hasMetaFile = false;
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
return true; return true;
} }
@@ -640,19 +630,19 @@ public:
private: private:
// creates a bitmap and assigns it to m_dobjBitmap (also sets m_hasBitmap) // creates a bitmap and assigns it to m_dobjBitmap (also sets m_hasBitmap)
void CreateBitmap() const; void CreateBitmap() const;
#if wxUSE_METAFILES #if wxUSE_METAFILE
void CreateMetaFile() const; void CreateMetaFile() const;
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
wxDataFormat m_formatShape; // our custom format wxDataFormat m_formatShape; // our custom format
wxBitmapDataObject m_dobjBitmap; // it handles bitmaps wxBitmapDataObject m_dobjBitmap; // it handles bitmaps
bool m_hasBitmap; // true if m_dobjBitmap has valid bitmap bool m_hasBitmap; // true if m_dobjBitmap has valid bitmap
#if wxUSE_METAFILES #if wxUSE_METAFILE
wxMetaFileDataObject m_dobjMetaFile;// handles metafiles wxMetaFileDataObject m_dobjMetaFile;// handles metafiles
bool m_hasMetaFile; // true if we have valid metafile bool m_hasMetaFile; // true if we have valid metafile
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
DnDShape *m_shape; // our data DnDShape *m_shape; // our data
}; };
@@ -786,9 +776,9 @@ private:
static void ShowBitmap(const wxBitmap& bitmap); static void ShowBitmap(const wxBitmap& bitmap);
#if wxUSE_METAFILES #if wxUSE_METAFILE
static void ShowMetaFile(const wxMetaFile& metafile); static void ShowMetaFile(const wxMetaFile& metafile);
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// IDs for the menu commands // IDs for the menu commands
@@ -833,9 +823,9 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
EVT_MENU(Menu_Paste, DnDFrame::OnPaste) EVT_MENU(Menu_Paste, DnDFrame::OnPaste)
EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap) EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap)
EVT_MENU(Menu_PasteBitmap,DnDFrame::OnPasteBitmap) EVT_MENU(Menu_PasteBitmap,DnDFrame::OnPasteBitmap)
#if wxUSE_METAFILES #if wxUSE_METAFILE
EVT_MENU(Menu_PasteMFile, DnDFrame::OnPasteMetafile) EVT_MENU(Menu_PasteMFile, DnDFrame::OnPasteMetafile)
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
EVT_MENU(Menu_CopyFiles, DnDFrame::OnCopyFiles) EVT_MENU(Menu_CopyFiles, DnDFrame::OnCopyFiles)
EVT_UPDATE_UI(Menu_DragMoveDef, DnDFrame::OnUpdateUIMoveByDefault) EVT_UPDATE_UI(Menu_DragMoveDef, DnDFrame::OnUpdateUIMoveByDefault)
@@ -877,11 +867,11 @@ BEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow)
EVT_PAINT(DnDCanvasBitmap::OnPaint) EVT_PAINT(DnDCanvasBitmap::OnPaint)
END_EVENT_TABLE() END_EVENT_TABLE()
#if wxUSE_METAFILES #if wxUSE_METAFILE
BEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow) BEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow)
EVT_PAINT(DnDCanvasMetafile::OnPaint) EVT_PAINT(DnDCanvasMetafile::OnPaint)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
@@ -967,10 +957,10 @@ DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
clip_menu->AppendSeparator(); clip_menu->AppendSeparator();
clip_menu->Append(Menu_CopyBitmap, _T("Copy &bitmap\tCtrl-Shift-C")); clip_menu->Append(Menu_CopyBitmap, _T("Copy &bitmap\tCtrl-Shift-C"));
clip_menu->Append(Menu_PasteBitmap, _T("Paste b&itmap\tCtrl-Shift-V")); clip_menu->Append(Menu_PasteBitmap, _T("Paste b&itmap\tCtrl-Shift-V"));
#if wxUSE_METAFILES #if wxUSE_METAFILE
clip_menu->AppendSeparator(); clip_menu->AppendSeparator();
clip_menu->Append(Menu_PasteMFile, _T("Paste &metafile\tCtrl-M")); clip_menu->Append(Menu_PasteMFile, _T("Paste &metafile\tCtrl-M"));
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
clip_menu->AppendSeparator(); clip_menu->AppendSeparator();
clip_menu->Append(Menu_CopyFiles, _T("Copy &files\tCtrl-F")); clip_menu->Append(Menu_CopyFiles, _T("Copy &files\tCtrl-F"));
@@ -1339,7 +1329,7 @@ void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event))
wxTheClipboard->Close(); wxTheClipboard->Close();
} }
#if wxUSE_METAFILES #if wxUSE_METAFILE
void DnDFrame::OnPasteMetafile(wxCommandEvent& WXUNUSED(event)) void DnDFrame::OnPasteMetafile(wxCommandEvent& WXUNUSED(event))
{ {
@@ -1375,7 +1365,7 @@ void DnDFrame::OnPasteMetafile(wxCommandEvent& WXUNUSED(event))
wxTheClipboard->Close(); wxTheClipboard->Close();
} }
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// file clipboard // file clipboard
@@ -1909,7 +1899,7 @@ DnDShape *DnDShape::New(const void *buf)
// DnDShapeDataObject // DnDShapeDataObject
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_METAFILES #if wxUSE_METAFILE
void DnDShapeDataObject::CreateMetaFile() const void DnDShapeDataObject::CreateMetaFile() const
{ {
@@ -1929,7 +1919,7 @@ void DnDShapeDataObject::CreateMetaFile() const
delete mf; delete mf;
} }
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
void DnDShapeDataObject::CreateBitmap() const void DnDShapeDataObject::CreateBitmap() const
{ {
@@ -1975,7 +1965,7 @@ static void ShowBitmap(const wxBitmap& bitmap)
frame->Show(true); frame->Show(true);
} }
#if wxUSE_METAFILES #if wxUSE_METAFILE
static void ShowMetaFile(const wxMetaFile& metafile) static void ShowMetaFile(const wxMetaFile& metafile)
{ {
@@ -1992,6 +1982,6 @@ static void ShowMetaFile(const wxMetaFile& metafile)
frame->Show(); frame->Show();
} }
#endif // wxUSE_METAFILES #endif // wxUSE_METAFILE
#endif // wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD #endif // wxUSE_DRAG_AND_DROP || wxUSE_CLIPBOARD