Rebake from clean wx tree.

[wxWidgets.git] / include / wx / motif / window.h

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index c5a294f3c300478df6b1f4bbb371b78f3e227c90..0069899bff66001d0fa9b9b43317758a1099fe6b 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -71,12 +71,6 @@ public:
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;

-    virtual void GetTextExtent(const wxString& string,
-        int *x, int *y,
-        int *descent = (int *) NULL,
-        int *externalLeading = (int *) NULL,
-        const wxFont *theFont = (const wxFont *) NULL)
-        const;

 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
         int range, bool refresh = true );
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
         int range, bool refresh = true );


@@ -85,7 +79,7 @@ public:
     virtual int GetScrollThumb( int orient ) const;
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,
     virtual int GetScrollThumb( int orient ) const;
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,

-        const wxRect* rect = (wxRect *) NULL );
+        const wxRect* rect = NULL );

 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );


@@ -280,6 +274,11 @@ protected:
     int                   m_scrollPosY;
 
     // implement the base class pure virtuals
     int                   m_scrollPosY;
 
     // implement the base class pure virtuals

+    virtual void DoGetTextExtent(const wxString& string,
+                                 int *x, int *y,
+                                 int *descent = NULL,
+                                 int *externalLeading = NULL,
+                                 const wxFont *font = NULL) const;

     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
     virtual void DoGetPosition( int *x, int *y ) const;


@@ -303,7 +302,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindow)
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindow)

-    DECLARE_NO_COPY_CLASS(wxWindow)
+    wxDECLARE_NO_COPY_CLASS(wxWindow);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -319,7 +318,7 @@ private:
 // from scope.
 // ----------------------------------------------------------------------------
 
 // from scope.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNoOptimize
+class WXDLLIMPEXP_CORE wxNoOptimize

 {
 public:
     wxNoOptimize() { ms_count++; }
 {
 public:
     wxNoOptimize() { ms_count++; }