wxCocoa: Basic support for font underlining:

[wxWidgets.git] / include / wx / msw / regconf.h

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index d0d0172bd58d499f4f0620b392910c033c3a9163..59fc5c67d2ad625b363b6cdd3ba3c2a7e19dc2ad 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -12,16 +12,13 @@
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "regconf.h"
-#endif
-

 #ifndef   _REGISTRY_H
   #include "wx/msw/registry.h"
 #endif
 
 #include "wx/object.h"
 #include "wx/confbase.h"
 #ifndef   _REGISTRY_H
   #include "wx/msw/registry.h"
 #endif
 
 #include "wx/object.h"
 #include "wx/confbase.h"

+#include "wx/buffer.h"

 
 // ----------------------------------------------------------------------------
 // wxRegConfig
 
 // ----------------------------------------------------------------------------
 // wxRegConfig


@@ -39,7 +36,7 @@ public:
               long style = wxCONFIG_USE_GLOBAL_FILE);
 
     // dtor will save unsaved data
               long style = wxCONFIG_USE_GLOBAL_FILE);
 
     // dtor will save unsaved data

-  virtual ~wxRegConfig(){};
+  virtual ~wxRegConfig(){}

 
   // implement inherited pure virtual functions
   // ------------------------------------------
 
   // implement inherited pure virtual functions
   // ------------------------------------------


@@ -94,21 +91,22 @@ protected:
   // implement read/write methods
   virtual bool DoReadString(const wxString& key, wxString *pStr) const;
   virtual bool DoReadLong(const wxString& key, long *plResult) const;
   // implement read/write methods
   virtual bool DoReadString(const wxString& key, wxString *pStr) const;
   virtual bool DoReadLong(const wxString& key, long *plResult) const;

+  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;

 
   virtual bool DoWriteString(const wxString& key, const wxString& szValue);
   virtual bool DoWriteLong(const wxString& key, long lValue);
 
   virtual bool DoWriteString(const wxString& key, const wxString& szValue);
   virtual bool DoWriteLong(const wxString& key, long lValue);

+  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);

 
 private:
 
 private:

-  // no copy ctor/assignment operator
-  wxRegConfig(const wxRegConfig&);
-  wxRegConfig& operator=(const wxRegConfig&);
-

   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,
             m_keyGlobalRoot, m_keyGlobal;
 
   // current path (not '/' terminated)
   wxString  m_strPath;
   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,
             m_keyGlobalRoot, m_keyGlobal;
 
   // current path (not '/' terminated)
   wxString  m_strPath;

+
+  DECLARE_NO_COPY_CLASS(wxRegConfig)
+  DECLARE_ABSTRACT_CLASS(wxRegConfig)

 };
 
 #endif  //_REGCONF_H
 };
 
 #endif  //_REGCONF_H