Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 34a1364f066ca0689d7d6b25d14024e538ed3b79..4c9078e9895dd14843ca2552690e2256d0e66198 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -14,6 +14,7 @@
 
 #ifdef __WXGTK3__
     typedef struct _cairo cairo_t;
 
 #ifdef __WXGTK3__
     typedef struct _cairo cairo_t;

+    typedef struct _GtkStyleProvider GtkStyleProvider;

     #define WXUNUSED_IN_GTK3(x)
 #else
     #define WXUNUSED_IN_GTK3(x) x
     #define WXUNUSED_IN_GTK3(x)
 #else
     #define WXUNUSED_IN_GTK3(x) x


@@ -59,8 +60,6 @@ public:
     // implement base class (pure) virtual methods
     // -------------------------------------------
 
     // implement base class (pure) virtual methods
     // -------------------------------------------
 

-    virtual bool Destroy();
-

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


@@ -204,6 +203,7 @@ public:
     // Called when m_widget becomes realized. Derived classes must call the
     // base class method if they override it.
     virtual void GTKHandleRealized();
     // Called when m_widget becomes realized. Derived classes must call the
     // base class method if they override it.
     virtual void GTKHandleRealized();

+    void GTKHandleUnrealize();

 
 protected:
     // for controls composed of multiple GTK widgets, return true to eliminate
 
 protected:
     // for controls composed of multiple GTK widgets, return true to eliminate


@@ -307,7 +307,6 @@ public:
     // extra (wxGTK-specific) flags
     bool                 m_noExpose:1;          // wxGLCanvas has its own redrawing
     bool                 m_nativeSizeEvent:1;   // wxGLCanvas sends wxSizeEvent upon "alloc_size"
     // extra (wxGTK-specific) flags
     bool                 m_noExpose:1;          // wxGLCanvas has its own redrawing
     bool                 m_nativeSizeEvent:1;   // wxGLCanvas sends wxSizeEvent upon "alloc_size"

-    bool                 m_hasVMT:1;            // set after PostCreation() is called

     bool                 m_isScrolling:1;       // dragging scrollbar thumb?
     bool                 m_clipPaintRegion:1;   // true after ScrollWindow()
     wxRegion             m_nativeUpdateRegion;  // not transformed for RTL
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?
     bool                 m_clipPaintRegion:1;   // true after ScrollWindow()
     wxRegion             m_nativeUpdateRegion;  // not transformed for RTL


@@ -351,14 +350,12 @@ protected:
 
     void GTKFreezeWidget(GtkWidget *w);
     void GTKThawWidget(GtkWidget *w);
 
     void GTKFreezeWidget(GtkWidget *w);
     void GTKThawWidget(GtkWidget *w);

+    void GTKDisconnect(void* instance);

 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 

-    // common part of all ctors (not virtual because called from ctor)
-    void Init();
-

     // Create a GtkScrolledWindow containing the given widget (usually
     // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows
     // the widget passed to it.
     // Create a GtkScrolledWindow containing the given widget (usually
     // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows
     // the widget passed to it.


@@ -377,10 +374,8 @@ protected:
 #ifndef __WXGTK3__
     // Called by ApplyWidgetStyle (which is called by SetFont() and
     // SetXXXColour etc to apply style changed to native widgets) to create
 #ifndef __WXGTK3__
     // 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. If forceStyle=true,
-    // creates empty GtkRcStyle if there are no modifications, otherwise
-    // returns NULL in such case.
-    GtkRcStyle *GTKCreateWidgetStyle(bool forceStyle = false);
+    // modified GTK style with non-standard attributes.
+    GtkRcStyle* GTKCreateWidgetStyle();

 #endif
 
     void GTKApplyWidgetStyle(bool forceStyle = false);
 #endif
 
     void GTKApplyWidgetStyle(bool forceStyle = false);


@@ -403,6 +398,8 @@ protected:
     void ConstrainSize();
 
 private:
     void ConstrainSize();
 
 private:

+    void Init();
+

     enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max };
 
     // common part of ScrollLines() and ScrollPages() and could be used, in the
     enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max };
 
     // common part of ScrollLines() and ScrollPages() and could be used, in the


@@ -416,6 +413,8 @@ private:
 #ifdef __WXGTK3__
     // paint context is stashed here so wxPaintDC can use it
     cairo_t* m_paintContext;
 #ifdef __WXGTK3__
     // paint context is stashed here so wxPaintDC can use it
     cairo_t* m_paintContext;

+    // style provider for "background-image"
+    GtkStyleProvider* m_styleProvider;

 
 public:
     cairo_t* GTKPaintContext() const
 
 public:
     cairo_t* GTKPaintContext() const