removed #errors in 2.7 compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 6918c3f8c47f7ccb2e666bde048bc38949a0811d..6d088a05c63cce9d3f4fc57059430337abfdc0bf 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -31,21 +31,21 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
     DECLARE_DYNAMIC_CLASS(wxWindowDC)

-        
+

 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );

-    
+

     ~wxWindowDC();
     ~wxWindowDC();

-    
+

     // TODO this function is Motif-only for now - should it go into base class?
     void Clear(const wxRect& rect);
     // TODO this function is Motif-only for now - should it go into base class?
     void Clear(const wxRect& rect);

-    
+

     // implement base class pure virtuals
     // ----------------------------------
     // implement base class pure virtuals
     // ----------------------------------

-    
+

     virtual void Clear();
     virtual void Clear();

-    
+

     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
     virtual void SetBrush(const wxBrush& brush);
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
     virtual void SetBrush(const wxBrush& brush);


@@ -53,10 +53,10 @@ public:
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
     virtual void SetLogicalFunction( int function );
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
     virtual void SetLogicalFunction( int function );

-    
+

     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);

-    
+

     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
     virtual void DoGetTextExtent(const wxString& string,
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
     virtual void DoGetTextExtent(const wxString& string,


@@ -64,27 +64,27 @@ public:
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxFont *theFont = NULL) const;
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxFont *theFont = NULL) const;

-    
+

     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;

-    
+

     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;

-    
+

     virtual void DestroyClippingRegion();
     virtual void DestroyClippingRegion();

-    
+

     // Helper function for setting clipping
     void SetDCClipping(WXRegion region);
     // Helper function for setting clipping
     void SetDCClipping(WXRegion region);

-    
+

     // implementation from now on
     // --------------------------
     // implementation from now on
     // --------------------------

-    
+

     WXGC GetGC() const { return m_gc; }
     WXGC GetBackingGC() const { return m_gcBacking; }
     WXDisplay* GetDisplay() const { return m_display; }
     bool GetAutoSetting() const { return m_autoSetting; }
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
     WXGC GetGC() const { return m_gc; }
     WXGC GetBackingGC() const { return m_gcBacking; }
     WXDisplay* GetDisplay() const { return m_display; }
     bool GetAutoSetting() const { return m_autoSetting; }
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }

-    
+

 protected:
     // note that this function will call colour.SetPixel,
     // and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK
 protected:
     // note that this function will call colour.SetPixel,
     // and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK


@@ -100,37 +100,37 @@ protected:
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
         int style = wxFLOOD_SURFACE);
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
         int style = wxFLOOD_SURFACE);

-    
+

     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;

-    
+

     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);

-    
+

     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
         wxCoord x2, wxCoord y2,
         wxCoord xc, wxCoord yc);
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
         double sa, double ea);
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
         wxCoord x2, wxCoord y2,
         wxCoord xc, wxCoord yc);
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
         double sa, double ea);

-    
+

     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height,
         double radius);
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height,
         double radius);
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

-    
+

     virtual void DoCrossHair(wxCoord x, wxCoord y);
     virtual void DoCrossHair(wxCoord x, wxCoord y);

-    
+

     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle);
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle);

-    
+

     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

-    
+

     virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
     virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);

-    
+

     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],


@@ -164,34 +164,27 @@ protected:
     int          m_currentStyle ;
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp
     int          m_currentStyle ;
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp

-
-    // this is useless and should be removed, kept for now just for backwards
-    // compatibility
-#if wxCHECK_VERSION(2, 7, 0)
-    #error "Remove wxClientDC::m_oldFont"
-#endif
-    WXFont       m_oldFont;

 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxPaintDC)
 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxPaintDC)

-        
+

 public:
     wxPaintDC() { }
     wxPaintDC(wxWindow* win);
 public:
     wxPaintDC() { }
     wxPaintDC(wxWindow* win);

-    
+

     ~wxPaintDC();
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxClientDC)
     ~wxPaintDC();
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxClientDC)

-        
+

 public:
     wxClientDC() { }
     wxClientDC(wxWindow* win) : wxWindowDC(win) { }
 };
 
 public:
     wxClientDC() { }
     wxClientDC(wxWindow* win) : wxWindowDC(win) { }
 };
 

-#endif
-// _WX_DCCLIENT_H_
+#endif // _WX_DCCLIENT_H_
+

diff --git a/src/common/event.cpp b/src/common/event.cpp
index ffd7048bb4f1d4c97883263c22c8e460dab1f26d..31196f57c49dac3ad37d7c649e81d884e5a66a0d 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -236,14 +236,6 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_CHANGED)
 
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_CHANGED)
 

-// see comments in wx/event.h, near wxEVT_SCROLL_ENDSCROLL declaration
-#if wxCHECK_VERSION(2, 7, 0)
-    #error "Remove the lines below, not needed any more"
-#endif
-#undef wxEVT_SCROLL_ENDSCROLL
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_ENDSCROLL;
-const wxEventType wxEVT_SCROLL_ENDSCROLL = wxEVT_SCROLL_CHANGED;
-

 // Scroll events from wxWindow
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)
 // Scroll events from wxWindow
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index f73f67e9102c1c87be5712c9ceda682b44d94fd2..befab3da0848228ea85089c078b67c0d90f78f65 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -263,12 +263,9 @@ wxSize wxWizardSizer::SiblingSize(wxSizerItem *child)
 // generic wxWizard implementation
 // ----------------------------------------------------------------------------
 
 // generic wxWizard implementation
 // ----------------------------------------------------------------------------
 

-#if wxCHECK_VERSION(2, 7, 0)
-    #error "Fix wxGTK vs. wxMSW difference other way"
-#else
-    WX_DEFINE_ARRAY_PTR(wxWizard *, wxModelessWizards);
-    wxModelessWizards modelessWizards;
-#endif
+// FIXME: this is a hack
+WX_DEFINE_ARRAY_PTR(wxWizard *, wxModelessWizards);
+static wxModelessWizards modelessWizards;

 
 void wxWizard::Init()
 {
 
 void wxWizard::Init()
 {

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index df2cdf3fa3238c8e8e92493234ceeeb3d13b0b7e..51919e9a082c95c6e35ecf3f566a432e4e738e43 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -149,7 +149,6 @@ void wxWindowDC::Init()
     m_display = (WXDisplay*) NULL;
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_display = (WXDisplay*) NULL;
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;

-    m_oldFont = (WXFont) 0;

     m_ok = false;
     m_clipRegion = (WXRegion) 0;
 }
     m_ok = false;
     m_clipRegion = (WXRegion) 0;
 }