corrected bug in MacRedraw

[wxWidgets.git] / wxPython / src / gtk / htmlhelp.py

diff --git a/wxPython/src/gtk/htmlhelp.py b/wxPython/src/gtk/htmlhelp.py
index 848ed85489e4fc69688f70e39a81a3b6302e258a..7df23d9cd0e9aae56eec3d720193f8de602f3717 100644 (file)
--- a/wxPython/src/gtk/htmlhelp.py
+++ b/wxPython/src/gtk/htmlhelp.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -38,56 +40,6 @@ from printfw import *
 from sizers import *
 
 from filesys import *
-
-from utils import *
-class wxHtmlHelpFrameCfgPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __setattr__(self,name,value):
-        if name == "x" :
-            htmlhelpc.wxHtmlHelpFrameCfg_x_set(self,value)
-            return
-        if name == "y" :
-            htmlhelpc.wxHtmlHelpFrameCfg_y_set(self,value)
-            return
-        if name == "w" :
-            htmlhelpc.wxHtmlHelpFrameCfg_w_set(self,value)
-            return
-        if name == "h" :
-            htmlhelpc.wxHtmlHelpFrameCfg_h_set(self,value)
-            return
-        if name == "sashpos" :
-            htmlhelpc.wxHtmlHelpFrameCfg_sashpos_set(self,value)
-            return
-        if name == "navig_on" :
-            htmlhelpc.wxHtmlHelpFrameCfg_navig_on_set(self,value)
-            return
-        self.__dict__[name] = value
-    def __getattr__(self,name):
-        if name == "x" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_x_get(self)
-        if name == "y" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_y_get(self)
-        if name == "w" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_w_get(self)
-        if name == "h" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_h_get(self)
-        if name == "sashpos" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_sashpos_get(self)
-        if name == "navig_on" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_navig_on_get(self)
-        raise AttributeError,name
-    def __repr__(self):
-        return "<C wxHtmlHelpFrameCfg instance at %s>" % (self.this,)
-class wxHtmlHelpFrameCfg(wxHtmlHelpFrameCfgPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(htmlhelpc.new_wxHtmlHelpFrameCfg,_args,_kwargs)
-        self.thisown = 1
-
-
-
-
 class wxHtmlBookRecordPtr :
     def __init__(self,this):
         self.this = this
@@ -281,6 +233,7 @@ class wxHtmlHelpFrame(wxHtmlHelpFramePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(htmlhelpc.new_wxHtmlHelpFrame,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -335,6 +288,7 @@ class wxHtmlHelpController(wxHtmlHelpControllerPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(htmlhelpc.new_wxHtmlHelpController,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -347,16 +301,12 @@ class wxHtmlHelpController(wxHtmlHelpControllerPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
-wxID_HTML_PANEL = htmlhelpc.wxID_HTML_PANEL
-wxID_HTML_BACK = htmlhelpc.wxID_HTML_BACK
-wxID_HTML_FORWARD = htmlhelpc.wxID_HTML_FORWARD
-wxID_HTML_TREECTRL = htmlhelpc.wxID_HTML_TREECTRL
-wxID_HTML_INDEXPAGE = htmlhelpc.wxID_HTML_INDEXPAGE
-wxID_HTML_INDEXLIST = htmlhelpc.wxID_HTML_INDEXLIST
-wxID_HTML_NOTEBOOK = htmlhelpc.wxID_HTML_NOTEBOOK
-wxID_HTML_SEARCHPAGE = htmlhelpc.wxID_HTML_SEARCHPAGE
-wxID_HTML_SEARCHTEXT = htmlhelpc.wxID_HTML_SEARCHTEXT
-wxID_HTML_SEARCHLIST = htmlhelpc.wxID_HTML_SEARCHLIST
-wxID_HTML_SEARCHBUTTON = htmlhelpc.wxID_HTML_SEARCHBUTTON
-wxID_HTML_SEARCHCHOICE = htmlhelpc.wxID_HTML_SEARCHCHOICE
-wxID_HTML_HELPFRAME = htmlhelpc.wxID_HTML_HELPFRAME
+wxHF_TOOLBAR = htmlhelpc.wxHF_TOOLBAR
+wxHF_FLATTOOLBAR = htmlhelpc.wxHF_FLATTOOLBAR
+wxHF_CONTENTS = htmlhelpc.wxHF_CONTENTS
+wxHF_INDEX = htmlhelpc.wxHF_INDEX
+wxHF_SEARCH = htmlhelpc.wxHF_SEARCH
+wxHF_BOOKMARKS = htmlhelpc.wxHF_BOOKMARKS
+wxHF_OPENFILES = htmlhelpc.wxHF_OPENFILES
+wxHF_PRINT = htmlhelpc.wxHF_PRINT
+wxHF_DEFAULTSTYLE = htmlhelpc.wxHF_DEFAULTSTYLE