Well, I see the patch files are all hosed up. I''ll redo them and
resubmit.
<mutter>
Roy Sutton wrote:> These files add the virtual function AcceptFocus that was missing from
> wxWindow.h. In order to make things right I had to make sure it was
> also declared in all the places where wxWindows also changes it.
> Also, in wxTextCtrl on Windows GetDefaultAttributes needs to be
> redeclared. I haven''t downloaded the Unix and Mac headers for
2.6.3
> so I couldn''t see if it also applies to other installs. You
should
> check. In a couple places AcceptFocus is #ifdef''ed to only affect
> Windows, for the same reason. I don''t -think- there''s
any harm in
> redeclaring it even if it''s not redeclared but I didn''t
want to chance
> it. I''m trying to keep these patches more bite-sized and focused
on a
> specific problem area. If we can get this applied I can work on the
> next set.
>
> Roy
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxWindow.h
> Index: wxruby2/swig/classes/include/wxWindow.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxWindow.h,v
> retrieving revision 1.13
> diff -b -u -r1.13 wxWindow.h
> --- wxruby2/swig/classes/include/wxWindow.h 26 Aug 2006 03:58:57 -0000 1.13
> +++ wxruby2/swig/classes/include/wxWindow.h 3 Sep 2006 04:01:53 -0000
> @@ -38,6 +38,8 @@
> * \param wxWindow*
> */
>
> + virtual bool AcceptsFocus() const;
> +
> virtual void AddChild(wxWindow* child ) ;
> /**
> * \brief Directs all mouse input to this window. Call to
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxGauge.h
> Index: wxruby2/swig/classes/include/wxGauge.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxGauge.h,v
> retrieving revision 1.3
> diff -b -u -r1.3 wxGauge.h
> --- wxruby2/swig/classes/include/wxGauge.h 31 Jan 2005 04:18:52 -0000 1.3
> +++ wxruby2/swig/classes/include/wxGauge.h 3 Sep 2006 01:47:38 -0000
> @@ -89,6 +89,7 @@
> */
>
> void SetValue(int pos ) ;
> + virtual bool AcceptsFocus() const { return false; }
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxRadioBox.h
> Index: wxruby2/swig/classes/include/wxRadioBox.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxRadioBox.h,v
> retrieving revision 1.5
> diff -b -u -r1.5 wxRadioBox.h
> --- wxruby2/swig/classes/include/wxRadioBox.h 21 Apr 2006 01:56:04 -0000
1.5
> +++ wxruby2/swig/classes/include/wxRadioBox.h 3 Sep 2006 01:57:02 -0000
> @@ -30,6 +30,9 @@
> virtual bool Show(bool show = true);
> virtual bool Show(int item, bool show = true);
> virtual wxString GetString(int n ) const;
> +#if defined(__WXMSW__)
> + virtual bool AcceptsFocus() const { return true; }
> +#endif
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxSpinButton.h
> Index: wxruby2/swig/classes/include/wxSpinButton.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxSpinButton.h,v
> retrieving revision 1.3
> diff -b -u -r1.3 wxSpinButton.h
> --- wxruby2/swig/classes/include/wxSpinButton.h 31 Jan 2005 04:18:52 -0000
1.3
> +++ wxruby2/swig/classes/include/wxSpinButton.h 3 Sep 2006 01:57:44 -0000
> @@ -69,6 +69,9 @@
> */
>
> void SetValue(int value ) ;
> +#if defined(__WXMSW__)
> + virtual bool AcceptsFocus() const { return false; }
> +#endif
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxSpinCtrl.h
> Index: wxruby2/swig/classes/include/wxSpinCtrl.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxSpinCtrl.h,v
> retrieving revision 1.3
> diff -b -u -r1.3 wxSpinCtrl.h
> --- wxruby2/swig/classes/include/wxSpinCtrl.h 31 Jan 2005 04:18:52 -0000
1.3
> +++ wxruby2/swig/classes/include/wxSpinCtrl.h 3 Sep 2006 01:57:57 -0000
> @@ -91,6 +91,9 @@
> */
>
> int GetMax() const;
> +#if defined(__WXMSW__)
> + virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
> +#endif
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxStaticBitmap.h
> Index: wxruby2/swig/classes/include/wxStaticBitmap.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxStaticBitmap.h,v
> retrieving revision 1.4
> diff -b -u -r1.4 wxStaticBitmap.h
> --- wxruby2/swig/classes/include/wxStaticBitmap.h 31 Jan 2005 04:18:52
-0000 1.4
> +++ wxruby2/swig/classes/include/wxStaticBitmap.h 3 Sep 2006 01:48:02 -0000
> @@ -48,6 +48,8 @@
> */
>
> virtual void SetBitmap(const wxBitmap& label ) ;
> + virtual bool AcceptsFocus() const { return false; }
> + virtual bool HasTransparentBackground() { return true; }
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxStaticBox.h
> Index: wxruby2/swig/classes/include/wxStaticBox.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxStaticBox.h,v
> retrieving revision 1.3
> diff -b -u -r1.3 wxStaticBox.h
> --- wxruby2/swig/classes/include/wxStaticBox.h 31 Jan 2005 04:18:52 -0000
1.3
> +++ wxruby2/swig/classes/include/wxStaticBox.h 3 Sep 2006 01:41:12 -0000
> @@ -43,6 +43,8 @@
> */
>
> bool Create(wxWindow* parent , wxWindowID id , const wxString&
label , const wxPoint& pos = wxDefaultPosition, const wxSize& size =
wxDefaultSize, long style = 0, const wxString& name =
wxT("staticBox")) ;
> + virtual bool AcceptsFocus() const { return false; }
> + virtual bool HasTransparentBackground() { return true; }
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxStaticLine.h
> Index: wxruby2/swig/classes/include/wxStaticLine.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxStaticLine.h,v
> retrieving revision 1.4
> diff -b -u -r1.4 wxStaticLine.h
> --- wxruby2/swig/classes/include/wxStaticLine.h 3 Sep 2005 20:07:43 -0000
1.4
> +++ wxruby2/swig/classes/include/wxStaticLine.h 3 Sep 2006 01:39:51 -0000
> @@ -48,6 +48,7 @@
> */
>
> int GetDefaultSize() ;
> + virtual bool AcceptsFocus() const { return false; }
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxStaticText.h
> Index: wxruby2/swig/classes/include/wxStaticText.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxStaticText.h,v
> retrieving revision 1.4
> diff -b -u -r1.4 wxStaticText.h
> --- wxruby2/swig/classes/include/wxStaticText.h 21 Apr 2006 01:56:04 -0000
1.4
> +++ wxruby2/swig/classes/include/wxStaticText.h 3 Sep 2006 01:37:46 -0000
> @@ -49,6 +49,10 @@
> virtual void SetLabel(const wxString& label ) ;
> // the following were missing from the xml
> virtual ~wxStaticText();
> +
> + virtual bool AcceptsFocus() const { return false; }
> + virtual bool HasTransparentBackground() { return true; }
> +
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxStatusBar.h
> Index: wxruby2/swig/classes/include/wxStatusBar.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxStatusBar.h,v
> retrieving revision 1.4
> diff -b -u -r1.4 wxStatusBar.h
> --- wxruby2/swig/classes/include/wxStatusBar.h 20 Jul 2005 00:56:02 -0000
1.4
> +++ wxruby2/swig/classes/include/wxStatusBar.h 3 Sep 2006 01:41:33 -0000
> @@ -109,6 +109,7 @@
> */
>
> virtual void SetStatusWidths(int n , int * widths ) ;
> + virtual bool AcceptsFocus() const { return false; }
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxTextCtrl.h
> Index: wxruby2/swig/classes/include/wxTextCtrl.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxTextCtrl.h,v
> retrieving revision 1.9
> diff -b -u -r1.9 wxTextCtrl.h
> --- wxruby2/swig/classes/include/wxTextCtrl.h 25 Aug 2006 04:22:34 -0000
1.9
> +++ wxruby2/swig/classes/include/wxTextCtrl.h 3 Sep 2006 03:58:39 -0000
> @@ -169,6 +169,13 @@
> virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
>
> virtual bool ShouldInheritColours() const;
> +
> +#if defined(__WXMSW__)
> + protected:
> + virtual wxVisualAttributes GetDefaultAttributes() const;
> + virtual bool AcceptsFocus() const;
> +#endif
> +
> };
>
>
>
> ------------------------------------------------------------------------
>
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
login
> Logging in to :pserver:anonymous at rubyforge.org:2401:/var/cvs/wxruby
>
> C:\RubyDev>cvs -d :pserver:anonymous at rubyforge.org:/var/cvs/wxruby
diff -b -u wxruby2/swig/classes/include/wxToolBar.h
> Index: wxruby2/swig/classes/include/wxToolBar.h
> ==================================================================> RCS
file: /var/cvs/wxruby/wxruby2/swig/classes/include/wxToolBar.h,v
> retrieving revision 1.4
> diff -b -u -r1.4 wxToolBar.h
> --- wxruby2/swig/classes/include/wxToolBar.h 31 Jan 2005 04:18:52 -0000 1.4
> +++ wxruby2/swig/classes/include/wxToolBar.h 3 Sep 2006 01:43:14 -0000
> @@ -367,6 +367,8 @@
> void ToggleTool(int toolId , const bool toggle ) ;
> // the following were missing from the xml
> void SetRows(int rows);
> + virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ;
> + virtual bool AcceptsFocus() const { return false; }
> };
>
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> wxruby-users mailing list
> wxruby-users at rubyforge.org
> http://rubyforge.org/mailman/listinfo/wxruby-users