Further compile fixes.
Added module so that linking to GNOME printing code will install its wxPrintFactory. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,8 +10,8 @@
|
|||||||
#ifndef __gprint_H__
|
#ifndef __gprint_H__
|
||||||
#define __gprint_H__
|
#define __gprint_H__
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||||
#pragma interface "gprint.h"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Include wxWindows' headers
|
// Include wxWindows' headers
|
||||||
|
@@ -10,8 +10,8 @@
|
|||||||
#ifndef __gprint_H__
|
#ifndef __gprint_H__
|
||||||
#define __gprint_H__
|
#define __gprint_H__
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||||
#pragma interface "gprint.h"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Include wxWindows' headers
|
// Include wxWindows' headers
|
||||||
|
@@ -7,8 +7,8 @@
|
|||||||
// Licence: wxWindows Licence
|
// Licence: wxWindows Licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||||
#pragma implementation "gprint.cpp"
|
#pragma implementation "gprint.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -273,6 +273,7 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
|
|||||||
|
|
||||||
bool wxGnomePrinter::Setup( wxWindow *parent )
|
bool wxGnomePrinter::Setup( wxWindow *parent )
|
||||||
{
|
{
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
@@ -663,5 +664,19 @@ int wxGnomePrintDC::GetResolution()
|
|||||||
return 72;
|
return 72;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class wxGnomePrintModule: public wxModule
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
wxGnomePrintModule() {}
|
||||||
|
bool OnInit() { wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory ); return true; }
|
||||||
|
void OnExit() { }
|
||||||
|
|
||||||
|
private:
|
||||||
|
DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
|
||||||
|
};
|
||||||
|
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// wxUSE_LIBGNOMEPRINT
|
// wxUSE_LIBGNOMEPRINT
|
||||||
|
@@ -7,8 +7,8 @@
|
|||||||
// Licence: wxWindows Licence
|
// Licence: wxWindows Licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||||
#pragma implementation "gprint.cpp"
|
#pragma implementation "gprint.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -273,6 +273,7 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
|
|||||||
|
|
||||||
bool wxGnomePrinter::Setup( wxWindow *parent )
|
bool wxGnomePrinter::Setup( wxWindow *parent )
|
||||||
{
|
{
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
@@ -663,5 +664,19 @@ int wxGnomePrintDC::GetResolution()
|
|||||||
return 72;
|
return 72;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class wxGnomePrintModule: public wxModule
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
wxGnomePrintModule() {}
|
||||||
|
bool OnInit() { wxPrintFactory::SetPrintFactory( new wxGnomePrintFactory ); return true; }
|
||||||
|
void OnExit() { }
|
||||||
|
|
||||||
|
private:
|
||||||
|
DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
|
||||||
|
};
|
||||||
|
|
||||||
|
IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// wxUSE_LIBGNOMEPRINT
|
// wxUSE_LIBGNOMEPRINT
|
||||||
|
Reference in New Issue
Block a user