Some code renaming to avoid confusion. Test editable column in sample.

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 426505a5fdee0a5ba66ba468719299160ee0eff3..8480c4760f9f6dc3585a759616fd792108eb78dc 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        window.h
+// Name:        wx/x11/window.h

 // Purpose:     wxWindow class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxWindow class
 // Author:      Julian Smart
 // Modified by:


@@ -12,24 +12,20 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 

-#ifdef __GNUG__
-#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 wxWindowX11 : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowX11 : public wxWindowBase

 {
 {

-    friend class WXDLLEXPORT wxDC;
-    friend class WXDLLEXPORT wxWindowDC;
-    
+    friend class WXDLLIMPEXP_FWD_CORE wxDC;
+    friend class WXDLLIMPEXP_FWD_CORE wxWindowDC;
+

 public:
     wxWindowX11() { Init(); }
 public:
     wxWindowX11() { Init(); }

-    
+

     wxWindowX11(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
     wxWindowX11(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,


@@ -40,38 +36,39 @@ public:
         Init();
         Create(parent, id, pos, size, style, name);
     }
         Init();
         Create(parent, id, pos, size, style, name);
     }

-    
+

     virtual ~wxWindowX11();
     virtual ~wxWindowX11();

-    
+

     bool Create(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxPanelNameStr);
     bool Create(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxPanelNameStr);

-    
+

     virtual void Raise();
     virtual void Lower();
     virtual void Raise();
     virtual void Lower();

-    
-    virtual bool Show( bool show = TRUE );
-    virtual bool Enable( bool enable = TRUE );
-    
+
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
+
+    virtual bool Show( bool show = true );
+    virtual bool Enable( bool enable = true );
+

     virtual void SetFocus();
     virtual void SetFocus();

-    
+

     virtual void WarpPointer(int x, int y);
     virtual void WarpPointer(int x, int y);

-    
-    virtual void Refresh( bool eraseBackground = TRUE,
-        const wxRect *rect = (const wxRect *) NULL );
+
+    virtual void Refresh( bool eraseBackground = true,
+                          const wxRect *rect = (const wxRect *) NULL );

     virtual void Update();
     virtual void Update();

-    
-    virtual void Clear();
-    
+

     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetForegroundColour( const wxColour &colour );
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetForegroundColour( const wxColour &colour );

-    
+

     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont( const wxFont &font );
     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont( const wxFont &font );

-    
+

     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,


@@ -80,85 +77,95 @@ public:
         int *externalLeading = (int *) NULL,
         const wxFont *theFont = (const wxFont *) NULL)
         const;
         int *externalLeading = (int *) NULL,
         const wxFont *theFont = (const wxFont *) NULL)
         const;

-    
+

     virtual void ScrollWindow( int dx, int dy,
         const wxRect* rect = (wxRect *) NULL );
     virtual void ScrollWindow( int dx, int dy,
         const wxRect* rect = (wxRect *) NULL );

-    
-    virtual void SetSizeHints(int minW, int minH,
-        int maxW = -1, int maxH = -1,
-        int incW = -1, int incH = -1);
+
+    virtual void DoSetSizeHints(int minW, int minH,
+        int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
+        int incW = wxDefaultCoord, int incH = wxDefaultCoord);
+

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

-    
+

     // 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 WXWindow GetHandle() const { return GetMainWindow(); }
     // Get the unique identifier of a window
     virtual WXWindow GetHandle() const { return GetMainWindow(); }

-    
+

     // implementation from now on
     // --------------------------
     // implementation from now on
     // --------------------------

-    
+

     // accessors
     // ---------
     // accessors
     // ---------

-    
-    // Get main widget for this window, e.g. a text widget
+
+    // Get main X11 window

     virtual WXWindow GetMainWindow() const;
     virtual WXWindow GetMainWindow() const;

-    
-    // Get the underlying X window and display
-    WXWindow GetXWindow() const;
-    WXDisplay *GetXDisplay() const;
-    
+
+    // Get X11 window representing the client area
+    virtual WXWindow GetClientAreaWindow() const;
+

     void SetLastClick(int button, long timestamp)
     void SetLastClick(int button, long timestamp)

-    { m_lastButton = button; m_lastTS = timestamp; }
-    
+        { m_lastButton = button; m_lastTS = timestamp; }
+

     int GetLastClickedButton() const { return m_lastButton; }
     long GetLastClickTime() const { return m_lastTS; }
     int GetLastClickedButton() const { return m_lastButton; }
     long GetLastClickTime() const { return m_lastTS; }

-    
+

     // Gives window a chance to do something in response to a size message, e.g.
     // arrange status bar, toolbar etc.
     virtual bool PreResize();
     // Gives window a chance to do something in response to a size message, e.g.
     // arrange status bar, toolbar etc.
     virtual bool PreResize();

-    
-    // Generates paint events
-    void X11SendPaintEvents();
-    
+
+    // Generates paint events from m_updateRegion
+    void SendPaintEvents();
+
+    // Generates paint events from flag
+    void SendNcPaintEvents();
+
+    // Generates erase events from m_clearRegion
+    void SendEraseEvents();
+

     // Clip to paint region?
     bool GetClipPaintRegion() { return m_clipPaintRegion; }
     // Clip to paint region?
     bool GetClipPaintRegion() { return m_clipPaintRegion; }

-    
+
+    // Return clear region
+    wxRegion &GetClearRegion() { return m_clearRegion; }
+
+    void NeedUpdateNcAreaInIdle( bool update = true ) { m_updateNcArea = update; }
+
+    // Inserting into main window instead of client
+    // window. This is mostly for a wxWindow's own
+    // scrollbars.
+    void SetInsertIntoMain( bool insert = true ) { m_insertIntoMain = insert; }
+    bool GetInsertIntoMain() { return m_insertIntoMain; }
+

     // sets the fore/background colour for the given widget
     static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour);
     // sets the fore/background colour for the given widget
     static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour);

-    static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
-    
-    // For implementation purposes - sometimes decorations make the client area
-    // smaller
-    virtual wxPoint GetClientAreaOrigin() const;
-    
+    static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = false);
+

     // I don't want users to override what's done in idle so everything that
     // has to be done in idle time in order for wxX11 to work is done in
     // OnInternalIdle
     virtual void OnInternalIdle();
     // I don't want users to override what's done in idle so everything that
     // has to be done in idle time in order for wxX11 to work is done in
     // OnInternalIdle
     virtual void OnInternalIdle();

-    
-    // For compatibility across platforms (not in event table)
-    void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
-    
+

 protected:
 protected:

-    // Makes an adjustment to the window position (for example, a frame that has
-    // a toolbar that it manages itself).
-    virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);
-    

     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);

-    
+

     // For double-click detection
     long   m_lastTS;         // last timestamp
     int    m_lastButton;     // last pressed button
     // For double-click detection
     long   m_lastTS;         // last timestamp
     int    m_lastButton;     // last pressed button

-    
+

 protected:
 protected:

-    WXWindow              m_mainWidget;
+    WXWindow              m_mainWindow;
+    WXWindow              m_clientWindow;
+    bool                  m_insertIntoMain;
+
+    bool                  m_winCaptured;

     wxRegion              m_clearRegion;
     bool                  m_clipPaintRegion;
     wxRegion              m_clearRegion;
     bool                  m_clipPaintRegion;

-    bool                  m_winCaptured;  // ????
+    bool                  m_updateNcArea;

     bool                  m_needsInputFocus; // Input focus set in OnIdle
 
     // implement the base class pure virtuals
     bool                  m_needsInputFocus; // Input focus set in OnIdle
 
     // implement the base class pure virtuals


@@ -178,11 +185,11 @@ protected:
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS

-    
+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();

-    
+

     DECLARE_DYNAMIC_CLASS(wxWindowX11)
     DECLARE_NO_COPY_CLASS(wxWindowX11)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxWindowX11)
     DECLARE_NO_COPY_CLASS(wxWindowX11)
     DECLARE_EVENT_TABLE()


@@ -204,12 +211,11 @@ class WXDLLEXPORT wxNoOptimize
 public:
     wxNoOptimize() { ms_count++; }
     ~wxNoOptimize() { ms_count--; }
 public:
     wxNoOptimize() { ms_count++; }
     ~wxNoOptimize() { ms_count--; }

-    
+

     static bool CanOptimize() { return ms_count == 0; }
     static bool CanOptimize() { return ms_count == 0; }

-    
+

 protected:
     static int ms_count;
 };
 
 protected:
     static int ms_count;
 };
 

-#endif
-// _WX_WINDOW_H_
+#endif // _WX_WINDOW_H_