Use GTK_OBJECT_GET_CLASS macro.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index a167406a882b05d64d5dc1a5740e49b3b51b727e..ca1b3a199d36c5f2d8a78ca9aed53876aa30e73d 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -73,7 +73,7 @@ wxSize wxControl::DoGetBestSize() const
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )

         (m_widget, &req );
 
     return wxSize(req.width, req.height);
         (m_widget, &req );
 
     return wxSize(req.width, req.height);

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 18867ec77d2573786045add8b6124d904f432e8a..9ad17a94fe582e4899105635a6135e28c9aeca01 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -241,7 +241,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );

     if (req.width > ls.x) ls.x = req.width;
     
     wxSize newSize = size;
     if (req.width > ls.x) ls.x = req.width;
     
     wxSize newSize = size;


@@ -321,7 +321,7 @@ wxSize wxRadioBox::LayoutItems()
                 GtkRequisition req;
                 req.width = 2;
                 req.height = 2;
                 GtkRequisition req;
                 req.width = 2;
                 req.height = 2;

-                (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+                (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )

                       (button, &req );
                
                 if (req.width > max_len) max_len = req.width;
                       (button, &req );
                
                 if (req.width > max_len) max_len = req.width;


@@ -366,7 +366,7 @@ wxSize wxRadioBox::LayoutItems()
             GtkRequisition req;
             req.width = 2;
             req.height = 2;
             GtkRequisition req;
             req.width = 2;
             req.height = 2;

-            (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )

                   (button, &req );
 
             if (req.width > max) max = req.width;
                   (button, &req );
 
             if (req.width > max) max = req.width;

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 39664e6f76b62c67be38b988302290acc1881ea7..6e00a778984022dd9675ba0b10f9c9681b91a08d 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -150,7 +150,7 @@ wxSize wxStaticText::DoGetBestSize() const
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )

         (m_widget, &req );
 
     return wxSize(req.width, req.height);
         (m_widget, &req );
 
     return wxSize(req.width, req.height);

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index b85ed54228af93139e925ab983b8c717ed68ca58..20cf9afb4700c06dc788fd7ceb1f8533cdf477b5 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -406,7 +406,8 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
     }
 
     GtkRequisition req;
     }
 
     GtkRequisition req;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );

     m_width = req.width + m_xMargin;
     m_height = req.height + 2*m_yMargin;
 
     m_width = req.width + m_xMargin;
     m_height = req.height + 2*m_yMargin;
 

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index a167406a882b05d64d5dc1a5740e49b3b51b727e..ca1b3a199d36c5f2d8a78ca9aed53876aa30e73d 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -73,7 +73,7 @@ wxSize wxControl::DoGetBestSize() const
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )

         (m_widget, &req );
 
     return wxSize(req.width, req.height);
         (m_widget, &req );
 
     return wxSize(req.width, req.height);

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 18867ec77d2573786045add8b6124d904f432e8a..9ad17a94fe582e4899105635a6135e28c9aeca01 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -241,7 +241,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );

     if (req.width > ls.x) ls.x = req.width;
     
     wxSize newSize = size;
     if (req.width > ls.x) ls.x = req.width;
     
     wxSize newSize = size;


@@ -321,7 +321,7 @@ wxSize wxRadioBox::LayoutItems()
                 GtkRequisition req;
                 req.width = 2;
                 req.height = 2;
                 GtkRequisition req;
                 req.width = 2;
                 req.height = 2;

-                (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+                (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )

                       (button, &req );
                
                 if (req.width > max_len) max_len = req.width;
                       (button, &req );
                
                 if (req.width > max_len) max_len = req.width;


@@ -366,7 +366,7 @@ wxSize wxRadioBox::LayoutItems()
             GtkRequisition req;
             req.width = 2;
             req.height = 2;
             GtkRequisition req;
             req.width = 2;
             req.height = 2;

-            (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request )

                   (button, &req );
 
             if (req.width > max) max = req.width;
                   (button, &req );
 
             if (req.width > max) max = req.width;

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 39664e6f76b62c67be38b988302290acc1881ea7..6e00a778984022dd9675ba0b10f9c9681b91a08d 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -150,7 +150,7 @@ wxSize wxStaticText::DoGetBestSize() const
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )

         (m_widget, &req );
 
     return wxSize(req.width, req.height);
         (m_widget, &req );
 
     return wxSize(req.width, req.height);

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index b85ed54228af93139e925ab983b8c717ed68ca58..20cf9afb4700c06dc788fd7ceb1f8533cdf477b5 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/src/gtk1/tbargtk.cpp
@@ -406,7 +406,8 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
     }
 
     GtkRequisition req;
     }
 
     GtkRequisition req;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );

     m_width = req.width + m_xMargin;
     m_height = req.height + 2*m_yMargin;
 
     m_width = req.width + m_xMargin;
     m_height = req.height + 2*m_yMargin;