set up for OpenVMS richtext & regex and add more samples in compile cascade

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

diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index 25965867b91b5b33f193fc156b8167f6076b712e..4be644902d7c2c226086cc656f84f1fa19cc2e1c 100644 (file)
--- a/include/wx/palmos/window.h
+++ b/include/wx/palmos/window.h
@@ -27,7 +27,7 @@
 // wxWindow declaration for Palm
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowPalm : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowPalm : public wxWindowBase
 {
 public:
     wxWindowPalm() { Init(); }
@@ -79,12 +79,6 @@ public:
 
     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;
 
 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
@@ -97,7 +91,7 @@ public:
     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 );
 
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
@@ -231,6 +225,11 @@ protected:
     WXHMENU               m_hMenu; // Menu, if any
 
     // 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;
@@ -270,7 +269,7 @@ private:
     bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
 
     DECLARE_DYNAMIC_CLASS(wxWindowPalm)
-    DECLARE_NO_COPY_CLASS(wxWindowPalm)
+    wxDECLARE_NO_COPY_CLASS(wxWindowPalm);
     DECLARE_EVENT_TABLE()
 };