Added EVT_MOVE_START, EVT_MOVE_END (wxMSW only for now)

[wxWidgets.git] / include / wx / gtk / gnome / gprint.h

diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h
index 60b1c7bea5626d712a6ab19147cc5107a08dc465..d2d1ee6948553303c372b7573b8694de56acfca5 100644 (file)
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -179,10 +179,7 @@ public:
     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);
 
     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);
 

-    GnomePrintContext *GetPrintContext() { return m_gpc; }
-

 private:
 private:

-    GnomePrintContext *m_gpc;

     bool               m_native_preview;
 
 private:
     bool               m_native_preview;
 
 private:


@@ -197,7 +194,6 @@ private:
 class wxGnomePrintDC: public wxDC
 {
 public:
 class wxGnomePrintDC: public wxDC
 {
 public:

-    wxGnomePrintDC( wxGnomePrinter *printer );

     wxGnomePrintDC( const wxPrintData& data );
     virtual ~wxGnomePrintDC();
 
     wxGnomePrintDC( const wxPrintData& data );
     virtual ~wxGnomePrintDC();
 


@@ -258,12 +254,12 @@ protected:
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,

-                     wxFont *theFont = (wxFont *) NULL ) const;
+                     const wxFont *theFont = (wxFont *) NULL ) const;

     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
 

+    void SetPrintData(const wxPrintData& data);

     wxPrintData& GetPrintData() { return m_printData; }
     wxPrintData& GetPrintData() { return m_printData; }

-    void SetPrintData(const wxPrintData& data) { m_printData = data; }

 
 private:
     static float ms_PSScaleFactor;
 
 private:
     static float ms_PSScaleFactor;


@@ -277,15 +273,14 @@ private:
     unsigned char           m_currentRed;
     unsigned char           m_currentGreen;
     unsigned char           m_currentBlue;
     unsigned char           m_currentRed;
     unsigned char           m_currentGreen;
     unsigned char           m_currentBlue;

-    
+

     int                     m_deviceOffsetY;
 
     int                     m_deviceOffsetY;
 

-    wxGnomePrinter         *m_printer;

     GnomePrintContext      *m_gpc;
     GnomePrintContext      *m_gpc;

-    GnomePrintJob*          m_job; // only used and destroyed when created with wxPrintData
+    GnomePrintJob*          m_job;

 
     void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 
     void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

-    
+

 private:
     wxCoord XDEV2LOG(wxCoord x) const
     {
 private:
     wxCoord XDEV2LOG(wxCoord x) const
     {