Applied patch [ 1341085 ] richtext xml build fix

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

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index 1b19b931a9eafa7e207879e546d45b5bd15b28ab..835518fbce77e183cf18d44329beedf3d351efd8 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -12,17 +12,13 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "window.h"
-#endif
-

 #include "wx/region.h"
 
 // ----------------------------------------------------------------------------
 // wxWindow class for Motif - see also wxWindowBase
 // ----------------------------------------------------------------------------
 
 #include "wx/region.h"
 
 // ----------------------------------------------------------------------------
 // wxWindow class for Motif - see also wxWindowBase
 // ----------------------------------------------------------------------------
 

-class wxWindow : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindow : public wxWindowBase

 {
     friend class WXDLLEXPORT wxDC;
     friend class WXDLLEXPORT wxWindowDC;
 {
     friend class WXDLLEXPORT wxDC;
     friend class WXDLLEXPORT wxWindowDC;


@@ -97,7 +93,7 @@ public:
     
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept);
     
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept);

-    
+

     // Get the unique identifier of a window
     virtual WXWidget GetHandle() const { return GetMainWidget(); }
     
     // Get the unique identifier of a window
     virtual WXWidget GetHandle() const { return GetMainWidget(); }
     


@@ -148,10 +144,6 @@ public:
     void ClearUpdateRegion() { m_updateRegion.Clear(); }
     void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; }
     
     void ClearUpdateRegion() { m_updateRegion.Clear(); }
     void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; }
     

-    // For implementation purposes - sometimes decorations make the client area
-    // smaller
-    virtual wxPoint GetClientAreaOrigin() const;
-

     // Process idle (send update events)
     void OnInternalIdle();
     
     // Process idle (send update events)
     void OnInternalIdle();
     


@@ -295,7 +287,7 @@ protected:
     virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();
     virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();

-    
+

 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS