Smartphone menus.

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

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 730e840c4390008ac8fd0ac0f9a00fa0a85f72f3..a0496b7fb9e12cc86dfa7767a49284fb8368de98 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -11,7 +11,7 @@
 #ifndef __GTKWINDOWH__
 #define __GTKWINDOWH__
 
 #ifndef __GTKWINDOWH__
 #define __GTKWINDOWH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface
 #endif
 
     #pragma interface
 #endif
 


@@ -69,7 +69,7 @@ public:
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();

-    virtual void Clear();
+    virtual void ClearBackground();

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


@@ -153,15 +153,16 @@ public:
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 

-    // Creates a new widget style if none is there
-    // and sets m_widgetStyle to this value.
-    GtkStyle *GetWidgetStyle();
-
-    // Called by SetFont() and SetXXXColour etc
-    void SetWidgetStyle();
-
-    // Overridden in many GTK widgets who have to handle subwidgets
-    virtual void ApplyWidgetStyle();
+#ifdef __WXGTK20__
+    // Returns the default context which usually is anti-aliased
+    PangoContext   *GtkGetPangoDefaultContext();
+    
+    // Returns the X11 context which renders on the X11 client
+    // side (which can be remote) and which usually is not
+    // anti-aliased and is thus faster
+    PangoContext   *GtkGetPangoX11Context();
+    PangoContext   *m_x11Context;
+#endif

 
 #if wxUSE_TOOLTIPS
     virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 
 #if wxUSE_TOOLTIPS
     virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );


@@ -190,16 +191,20 @@ public:
 
     // see the docs in src/gtk/window.cpp
     GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK
 
     // see the docs in src/gtk/window.cpp
     GtkWidget           *m_widget;          // mostly the widget seen by the rest of GTK

-    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWindows
+    GtkWidget           *m_wxwindow;        // mostly the client area as per wxWidgets

 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 
 
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 

+#ifdef __WXGTK20__
+    GtkIMMulticontext   *m_imContext;
+#else

 #if HAVE_XIM
 #if HAVE_XIM

-    // XIM support for wxWindows
+    // XIM support for wxWidgets

     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif

+#endif

 
 #ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)
 
 #ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)


@@ -232,12 +237,6 @@ public:
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
 
     bool                 m_delayedForegroundColour:1;
     bool                 m_delayedBackgroundColour:1;
 

-    // Contains GTK's widgets internal information about non-default widget
-    // font and colours. we create one for each widget that gets any
-    // non-default attribute set via SetFont() or SetForegroundColour() /
-    // SetBackgroundColour().
-    GtkStyle            *m_widgetStyle;
-

     // C++ has no virtual methods in the constrcutor of any class but we need
     // different methods of inserting a child window into a wxFrame,
     // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
     // C++ has no virtual methods in the constrcutor of any class but we need
     // different methods of inserting a child window into a wxFrame,
     // wxMDIFrame, wxNotebook etc. this is the callback that will get used.


@@ -265,6 +264,14 @@ public:
 protected:
     // common part of all ctors (not virtual because called from ctor)
     void Init();
 protected:
     // common part of all ctors (not virtual because called from ctor)
     void Init();

+    
+    // Called by ApplyWidgetStyle (which is called by SetFont() and
+    // SetXXXColour etc to apply style changed to native widgets) to create
+    // modified GTK style with non-standard attributes. 
+    GtkRcStyle *CreateWidgetStyle();
+
+    // Overridden in many GTK widgets who have to handle subwidgets
+    virtual void ApplyWidgetStyle();

 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)