More X11 code

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

include/wx/x11/private.h

@@ -66,6 +66,11 @@ extern int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
 extern void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
 extern void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
 
+extern Window wxGetWindowParent(Window window);
+
+// For convenience
+inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }
+
 #define wxNO_COLORS   0x00
 #define wxBACK_COLORS 0x01
 #define wxFORE_COLORS 0x02

include/wx/x11/timer.h

@@ -1,44 +1,49 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.h
 // Purpose:     wxTimer class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Author:      Vaclav Slavik
+// Id:          $Id$
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_TIMER_H_
-#define _WX_TIMER_H_
+
+#ifndef __WX_TIMER_H__
+#define __WX_TIMER_H__
 
 #ifdef __GNUG__
-#pragma interface "timer.h"
+    #pragma interface "timer.h"
 #endif
 
+//-----------------------------------------------------------------------------
+// wxTimer
+//-----------------------------------------------------------------------------
+
+class wxTimerDesc;
+
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
-    friend void wxTimerCallback(wxTimer * timer);
-    
 public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
-    { Init(); }
+        { Init(); }
     ~wxTimer();
-    
-    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
+
+    virtual bool Start(int millisecs = -1, bool oneShot = FALSE);
     virtual void Stop();
-    
-    virtual bool IsRunning() const { return m_id != 0; }
-    
+
+    virtual bool IsRunning() const;
+
+    // implementation
+    static void NotifyTimers();
+
 protected:
     void Init();
-    
-    long m_id;
-    
+
 private:
-    DECLARE_DYNAMIC_CLASS(wxTimer)
+    wxTimerDesc *m_desc;
+    
+    DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
-#endif
-// _WX_TIMER_H_
+#endif // __WX_TIMER_H__

include/wx/x11/toplevel.h

@@ -62,6 +62,9 @@ public:
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
+    virtual void SetTitle( const wxString& title);
+    virtual wxString GetTitle() const;
+    
     // implementation from now on
     // --------------------------
 
@@ -92,6 +95,7 @@ protected:
     wxRect                m_fsOldSize;
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
+    wxString              m_title;
 };
 
 // list of all frames and modeless dialogs

include/wx/x11/window.h

@@ -50,10 +50,6 @@ public:
         long style = 0,
         const wxString& name = wxPanelNameStr);
     
-    // implement base class pure virtuals
-    virtual void SetTitle( const wxString& title);
-    virtual wxString GetTitle() const;
-    
     virtual void Raise();
     virtual void Lower();
     
@@ -185,15 +181,6 @@ protected:
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     
-    // Motif-specific
-    
-    // CanvasXXXSiize functions
-    void CanvasGetSize(int* width, int* height) const; // If have drawing area
-    void CanvasGetClientSize(int *width, int *height) const;
-    void CanvasGetPosition(int *x, int *y) const; // If have drawing area
-    void CanvasSetClientSize(int width, int size);
-    void CanvasSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    
     void SetMainWindow(WXWindow w) { m_mainWidget = w; }
     
     bool CanAddEventHandler() const { return m_canAddEventHandler; }
@@ -217,11 +204,6 @@ public:
     virtual void ChangeForegroundColour();
     
 protected:
-    // Adds the widget to the hash table and adds event handlers.
-    bool AttachWindow(wxWindow* parent, WXWindow mainWidget,
-        int x, int y, int width, int height);
-    bool DetachWindow(WXWindow widget);
-    
     // How to implement accelerators. If we find a key event, translate to
     // wxWindows wxKeyEvent form. Find a widget for the window. Now find a
     // wxWindow for the widget. If there isn't one, go up the widget hierarchy
@@ -294,6 +276,9 @@ protected:
     // by system
     int                   m_scrollPosX;
     int                   m_scrollPosY;
+
+    // Window border size
+    int                   m_borderSize;
     
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;