GNOME.org
 

ooo-build r11758 - trunk/patches/src680

Author: freuter
Date: Fri Feb 29 10:47:07 2008
New Revision: 11758
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11758&view=rev

Log:
more progress...


Modified:
   trunk/patches/src680/sw-team-pane.diff

Modified: trunk/patches/src680/sw-team-pane.diff
==============================================================================
--- trunk/patches/src680/sw-team-pane.diff	(original)
+++ trunk/patches/src680/sw-team-pane.diff	Fri Feb 29 10:47:07 2008
@@ -337,10 +337,10 @@
      long					CallCallback( USHORT nEvent, const void* pEvent )
 diff --git a/vcl/inc/vcl/syschildctrl.hxx b/vcl/inc/vcl/syschildctrl.hxx
 new file mode 100644
-index 0000000..0125472
+index 0000000..e09198f
 --- /dev/null
 +++ vcl/inc/vcl/syschildctrl.hxx
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,57 @@
 +/*
 + * written by Florian Reuter, (c) Novell Inc 2008
 + */
@@ -366,16 +366,21 @@
 +
 +class VCL_DLLPUBLIC SystemChildControl : public Control
 +{
++public:    
++    static const int DRAWING_AREA = 1;
++    static const int SOCKET = 2;
++    static const int BROWSER = 3;
++
 +using Control::ImplInit;
 +private:
 +    // Copy assignment is forbidden and not implemented.
 +	SAL_DLLPRIVATE SystemChildControl (const SystemChildControl &);
 +	SAL_DLLPRIVATE SystemChildControl & operator= (const SystemChildControl &);
-+
-+    SAL_DLLPRIVATE void ImplInitSysChildCtrl( Window* pParent, WinBits nStyle, SystemWindowData *pData, BOOL bShow = TRUE );
++    int _type;
++    SAL_DLLPRIVATE void ImplInitSysChildCtrl( Window* pParent, WinBits nStyle, SystemWindowData *pData, int type, BOOL bShow = TRUE );
 +
 +public:
-+    SystemChildControl(Window* pParent, WinBits nStyle = 0);
++    SystemChildControl(Window* pParent, int type, WinBits nStyle = 0);
 +    ~SystemChildControl();
 +
 +    virtual void    GetFocus();
@@ -392,7 +397,6 @@
 +    void load_url(char *url);
 +};
 +
-+
 +#endif
 diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
 index a9390b0..ece5079 100644
@@ -446,10 +450,10 @@
  			$(SLO)$/tabdlg.obj		\
 diff --git a/vcl/source/window/syschildctrl.cxx b/vcl/source/window/syschildctrl.cxx
 new file mode 100644
-index 0000000..b3a3027
+index 0000000..0c0d2de
 --- /dev/null
 +++ vcl/source/window/syschildctrl.cxx
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,215 @@
 +/*
 + * written by Florian Reuter, (c) Novell Inc 2008
 + */
@@ -539,9 +543,20 @@
 +}
 +
 +
-+void SystemChildControl::ImplInitSysChildCtrl( Window* pParent, WinBits nStyle, SystemWindowData *pData, BOOL bShow )
++void SystemChildControl::ImplInitSysChildCtrl( Window* pParent, WinBits nStyle, SystemWindowData *pData, int type, BOOL bShow )
 +{
-+    mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateSocket( pParent->ImplGetFrame(), bShow );
++    _type=type;
++    switch(type) {
++	case SOCKET:
++	    mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateSocket( pParent->ImplGetFrame(), bShow );
++	    break;
++	case BROWSER:
++	    mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateMozObject( pParent->ImplGetFrame(), bShow );
++	    break;
++	default:
++	    mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateObject( pParent->ImplGetFrame(), pData, bShow );
++	    break;
++    }
 +    Control::ImplInit( pParent, nStyle, NULL );
 +
 +    if ( GetSystemData() )
@@ -554,9 +569,9 @@
 +}
 +
 +
-+SystemChildControl::SystemChildControl( Window* pParent, WinBits nStyle ) : Control( WINDOW_SYSTEMCHILDCTRL )
++SystemChildControl::SystemChildControl( Window* pParent, int type, WinBits nStyle ) : Control( WINDOW_SYSTEMCHILDCTRL ), _type(0)
 +{
-+    ImplInitSysChildCtrl( pParent, nStyle, NULL );
++    ImplInitSysChildCtrl( pParent, nStyle, NULL, type );
 +    EnableInput();
 +}
 +
@@ -565,7 +580,17 @@
 +	Hide();
 +	if ( mpWindowImpl->mpSysObj )
 +	{
-+		ImplGetSVData()->mpDefInst->DestroySocket( mpWindowImpl->mpSysObj );
++	    switch (_type) {
++		case SOCKET:
++		    ImplGetSVData()->mpDefInst->DestroySocket( mpWindowImpl->mpSysObj );
++		    break;
++		case BROWSER:
++		    ImplGetSVData()->mpDefInst->DestroyMozObject( mpWindowImpl->mpSysObj );
++		    break;
++		default:
++		    ImplGetSVData()->mpDefInst->DestroyObject( mpWindowImpl->mpSysObj );
++		    break;
++	    }
 +		mpWindowImpl->mpSysObj = NULL;
 +	}
 +}
@@ -645,17 +670,21 @@
 +}
 +
 diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
-index f5383a0..41326fc 100644
+index f5383a0..4e0899f 100644
 --- vcl/unx/gtk/app/gtkinst.cxx
 +++ vcl/unx/gtk/app/gtkinst.cxx
-@@ -226,6 +226,27 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind
-     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
- }
- 
+@@ -223,7 +223,28 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind
+     if( pWindowData )
+         return X11SalObject::CreateObject( pParent, pWindowData, bShow );
+     
+-    return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
++    return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), GtkSalObject::DRAWING_AREA, bShow );
++}
++
 +
 +SalObject* GtkInstance::CreateSocket( SalFrame* pParent, BOOL bShow )
 +{
-+    return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
++    return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), GtkSalObject::SOCKET, bShow );
 +}
 +
 +void GtkInstance::DestroySocket( SalObject* pObject )
@@ -665,32 +694,53 @@
 +
 +SalObject* GtkInstance::CreateMozObject( SalFrame* pParent, BOOL bShow )
 +{
-+    return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
++    return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), GtkSalObject::MOZ_EMBEDD, bShow );
 +}
 +
 +void GtkInstance::DestroyMozObject( SalObject* pObject )
 +{
 +    delete pObject;
-+}
-+
- GtkYieldMutex::GtkYieldMutex()
- {
  }
+ 
+ GtkYieldMutex::GtkYieldMutex()
 diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
-index 1f1d7b5..da8fe96 100644
+index 1f1d7b5..2174c6a 100644
 --- vcl/unx/gtk/window/gtkobject.cxx
 +++ vcl/unx/gtk/window/gtkobject.cxx
-@@ -41,6 +41,9 @@
+@@ -41,14 +41,29 @@
  #include <plugins/gtk/gtkdata.hxx>
  #include <plugins/gtk/gtkinst.hxx>
  
+-GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow ) 
 +#include <gtkembedmoz/gtkmozembed.h>
 +
 +
- GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow ) 
++GtkSalObject::GtkSalObject( GtkSalFrame* pParent, int type, BOOL bShow ) 
          : m_pSocket( NULL ),
-           m_pRegion( NULL )
-@@ -224,3 +227,29 @@ void GtkSalObject::SetForwardKey( BOOL bEnable )
+-          m_pRegion( NULL )
++          m_pRegion( NULL ),
++	  mozCount(0)
+ {
+     if( pParent )
+     {
+         // our plug window
+-        m_pSocket = gtk_drawing_area_new();
++	switch(type) {
++	    case SOCKET:
++		m_pSocket = gtk_socket_new();
++		break;
++	    case MOZ_EMBEDD:
++		gtk_moz_embed_set_comp_path("/usr/lib/firefox"); 
++		gtk_moz_embed_set_profile_path("/home/freuter/.mozilla", "firefox"); 		m_pSocket = gtk_moz_embed_new();
++		break;
++	    default:
++		m_pSocket = gtk_drawing_area_new();
++	    break;
++	}
+         Show( bShow );
+         // insert into container
+         gtk_fixed_put( pParent->getFixedContainer(),
+@@ -224,3 +239,30 @@ void GtkSalObject::SetForwardKey( BOOL bEnable )
      else
          gtk_widget_set_events( GTK_WIDGET( m_pSocket ), ~(GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE) & gtk_widget_get_events( GTK_WIDGET( m_pSocket ) ) );
  }
@@ -720,6 +770,7 @@
 +    gtk_widget_show(GTK_WIDGET(embed));
 +   
 +}
++
 diff --git a/vcl/unx/gtk/window/makefile.mk b/vcl/unx/gtk/window/makefile.mk
 index 01e4fff..f84f2f9 100644
 --- vcl/unx/gtk/window/makefile.mk
@@ -837,10 +888,34 @@
  
  class GtkSalSystem : public X11SalSystem
 diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
-index 5ce3237..f4c90f9 100644
+index 5ce3237..92324d6 100644
 --- vcl/unx/inc/plugins/gtk/gtkobject.hxx
 +++ vcl/unx/inc/plugins/gtk/gtkobject.hxx
-@@ -74,6 +74,7 @@ public:
+@@ -51,16 +51,22 @@
+ 
+ class GtkSalObject : public SalObject
+ {
++public:
++    static const int DRAWING_AREA = 1;
++    static const int SOCKET = 2;
++    static const int MOZ_EMBEDD = 3;
++private:
+ 	SystemChildData		m_aSystemData;
+     GtkWidget*			m_pSocket;
+     GdkRegion*			m_pRegion;
++    int                         mozCount;
+ 
+     // signals
+     static gboolean		signalButton( GtkWidget*, GdkEventButton*, gpointer );
+     static gboolean		signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
+     static void			signalDestroy( GtkObject*, gpointer );
+ public:
+-    GtkSalObject( GtkSalFrame* pParent, BOOL bShow = TRUE );
++    GtkSalObject( GtkSalFrame* pParent, int type, BOOL bShow = TRUE );
+     virtual ~GtkSalObject();
+ 
+     // overload all pure virtual methods
+@@ -74,6 +80,7 @@ public:
  	virtual void					Show( BOOL bVisible );
  	virtual void					Enable( BOOL nEnable );
  	virtual void					GrabFocus();
@@ -848,12 +923,12 @@
  
  	virtual void					SetBackground();
  	virtual void					SetBackground( SalColor nSalColor );
-@@ -81,7 +82,8 @@ public:
+@@ -81,7 +88,8 @@ public:
          virtual void                                    SetForwardKey( BOOL bEnable );
  
  	virtual const SystemEnvData*	GetSystemData() const;
 -   
-+
++    
 +        virtual void LoadUrl(char *url);   
  };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]