projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set wxDIALOG_UNIT_COMPATIBILITY to 0 by default
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dc.h
diff --git
a/include/wx/gtk1/dc.h
b/include/wx/gtk1/dc.h
index 8c447ae4266e3bfad9dc04add64ea32a1b5af054..6022c4d72821a6eb0bb52497b1f8fdd3e2357ae4 100644
(file)
--- a/
include/wx/gtk1/dc.h
+++ b/
include/wx/gtk1/dc.h
@@
-11,7
+11,7
@@
#ifndef __GTKDCH__
#define __GTKDCH__
#ifndef __GTKDCH__
#define __GTKDCH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
@@
-25,6
+25,7
@@
class wxDC;
// constants
//-----------------------------------------------------------------------------
// constants
//-----------------------------------------------------------------------------
+#ifndef MM_TEXT
#define MM_TEXT 0
#define MM_ISOTROPIC 1
#define MM_ANISOTROPIC 2
#define MM_TEXT 0
#define MM_ISOTROPIC 1
#define MM_ANISOTROPIC 2
@@
-33,6
+34,7
@@
class wxDC;
#define MM_TWIPS 5
#define MM_POINTS 6
#define MM_METRIC 7
#define MM_TWIPS 5
#define MM_POINTS 6
#define MM_METRIC 7
+#endif
//-----------------------------------------------------------------------------
// wxDC
//-----------------------------------------------------------------------------
// wxDC
@@
-46,13
+48,10
@@
public:
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
- // the first two must be overridden and called
- virtual void DestroyClippingRegion();
-
// Resolution in pixels per logical inch
virtual wxSize GetPPI() const;
// Resolution in pixels per logical inch
virtual wxSize GetPPI() const;
- virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return
TRUE
; }
+ virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return
true
; }
virtual void EndDoc() { }
virtual void StartPage() { }
virtual void EndPage() { }
virtual void EndDoc() { }
virtual void StartPage() { }
virtual void EndPage() { }
@@
-147,9
+146,16
@@
public:
bool m_needComputeScaleX,
m_needComputeScaleY; // not yet used
bool m_needComputeScaleX,
m_needComputeScaleY; // not yet used
-
+
private:
DECLARE_ABSTRACT_CLASS(wxDC)
};
private:
DECLARE_ABSTRACT_CLASS(wxDC)
};
+// this must be defined when wxDC::Blit() honours the DC origian and needed to
+// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK
+// 2.3.[23]
+#ifndef wxHAS_WORKING_GTK_DC_BLIT
+ #define wxHAS_WORKING_GTK_DC_BLIT
+#endif
+
#endif // __GTKDCH__
#endif // __GTKDCH__