Took anonymous class out of wxHtmlHelpFrame; corrected some typos

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

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 9c3d14fc9c06493316d31df55b9425b8b4fe0ed2..922ac29777b62124ee176d565932a9bfc71d6cba 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -50,8 +50,7 @@ typedef struct _IMAGEN
 #define E_FORMATO       1           /* error in gif header */
 #define E_MEMORIA       2           /* error allocating memory */
 
 #define E_FORMATO       1           /* error in gif header */
 #define E_MEMORIA       2           /* error allocating memory */
 

-
-class wxGIFDecoder
+class WXDLLEXPORT wxGIFDecoder

 {
 private:
     /* logical screen */
 {
 private:
     /* logical screen */

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 5f2de5df08da1c3509879a3831255b82b83ae47b..6be92402de7dfc281a76aebb7d703a00b9fd4f1d 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -55,6 +55,17 @@ enum {
     wxID_HTML_HELPFRAME // the id of wxHtmlHelpController's helpframe
 };
 
     wxID_HTML_HELPFRAME // the id of wxHtmlHelpController's helpframe
 };
 

+class WXDLLEXPORT wxHtmlHelpFrameCfg
+{
+public:
+    wxHtmlHelpFrameCfg() {};
+       long x, y, w, h;
+       long sashpos;
+       bool navig_on;
+       int style; // flags given to wxHtmlHelpFrame ctor
+       wxString titleformat;
+};
+

 class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame)
 class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame)


@@ -153,14 +164,7 @@ protected:
     wxListBox *m_SearchList;
     wxChoice *m_SearchChoice;
 
     wxListBox *m_SearchList;
     wxChoice *m_SearchChoice;
 

-    struct WXDLLEXPORT _struct_Cfg {
-       long x, y, w, h;
-       long sashpos;
-       bool navig_on;
-       int style; // flags given to wxHtmlHelpFrame ctor
-       wxString titleformat;
-    } m_Cfg;
-    // settings (window size, position, sash pos etc..)
+    wxHtmlHelpFrameCfg m_Cfg;

     wxConfigBase *m_Config;
     wxString m_ConfigRoot;
 
     wxConfigBase *m_Config;
     wxString m_ConfigRoot;