some Linux compilation fixes

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

include/wx/filefn.h

@@ -186,11 +186,9 @@ WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const char *pszPath, const cha
 // ----------------------------------------------------------------------------
 
 // Path searching
-class WXDLLEXPORT wxPathList: public wxStringList
+class WXDLLEXPORT wxPathList : public wxStringList
 {
-  DECLARE_DYNAMIC_CLASS(wxPathList)
+public:
-
-  public:
     void AddEnvList(const wxString& envVariable);    // Adds all paths in environment variable
     void Add(const wxString& path);
     wxString FindValidPath(const wxString& filename);   // Find the first full path
@@ -201,6 +199,9 @@ class WXDLLEXPORT wxPathList: public wxStringList
     void EnsureFileAccessible(const wxString& path); // Given full path and filename,
     // add path to list
     bool Member(const wxString& path);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPathList)
 };
 
 #endif

include/wx/generic/tabg.h

@@ -85,11 +85,6 @@ protected:
 
 class WXDLLEXPORT wxTabLayer: public wxList
 {
-  DECLARE_DYNAMIC_CLASS(wxTabLayer)
-  public:
-    wxTabLayer(void)
-    {
-    }
 };
 
 /*

include/wx/postscrp.h

@@ -49,10 +49,10 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
 
  public:
   // Create a printer DC
-  wxPostScriptDC(void);
+  wxPostScriptDC();
   wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 
-  ~wxPostScriptDC(void);
+  ~wxPostScriptDC();
 
   bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 
@@ -92,22 +92,22 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
 #endif
   void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
 
-  void Clear(void);
+  void Clear();
   void SetFont(const wxFont& font);
   void SetPen(const wxPen& pen);
   void SetBrush(const wxBrush& brush);
   void SetLogicalFunction(int function);
   void SetBackground(const wxBrush& brush);
   void SetClippingRegion(long x, long y, long width, long height);
-  void DestroyClippingRegion(void);
+  void DestroyClippingRegion();
 
   bool StartDoc(const wxString& message);
-  void EndDoc(void);
+  void EndDoc();
-  void StartPage(void);
+  void StartPage();
-  void EndPage(void);
+  void EndPage();
 
-  long GetCharHeight(void);
+  long GetCharHeight();
-  long GetCharWidth(void);
+  long GetCharWidth();
   void GetTextExtent(const wxString& string, long *x, long *y,
                      long *descent = (long *) NULL,
                      long *externalLeading = (long *) NULL,
@@ -197,15 +197,15 @@ WXDLLEXPORT void wxSetPrinterFile(const char *f);
 WXDLLEXPORT void wxSetAFMPath(const char *f);
 
 // Get current values
-WXDLLEXPORT char* wxGetPrinterCommand(void);
+WXDLLEXPORT char* wxGetPrinterCommand();
-WXDLLEXPORT char* wxGetPrintPreviewCommand(void);
+WXDLLEXPORT char* wxGetPrintPreviewCommand();
-WXDLLEXPORT char* wxGetPrinterOptions(void);
+WXDLLEXPORT char* wxGetPrinterOptions();
-WXDLLEXPORT int wxGetPrinterOrientation(void);
+WXDLLEXPORT int wxGetPrinterOrientation();
 WXDLLEXPORT void wxGetPrinterScaling(double* x, double* y);
 WXDLLEXPORT void wxGetPrinterTranslation(long *x, long *y);
-WXDLLEXPORT int wxGetPrinterMode(void);
+WXDLLEXPORT int wxGetPrinterMode();
-WXDLLEXPORT char* wxGetPrinterFile(void);
+WXDLLEXPORT char* wxGetPrinterFile();
-WXDLLEXPORT char* wxGetAFMPath(void);
+WXDLLEXPORT char* wxGetAFMPath();
 
 /*
  * PostScript print setup information
@@ -213,9 +213,7 @@ WXDLLEXPORT char* wxGetAFMPath(void);
 
 class WXDLLEXPORT wxPrintSetupData: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxPrintSetupData)
+public:
-
- public:
     char *printerCommand;
     char *previewCommand;
     char *printerFlags;
@@ -231,9 +229,10 @@ class WXDLLEXPORT wxPrintSetupData: public wxObject
     // A name in the paper database (see wx_print.h: the printing framework)
     char *paperName;
     bool printColour;
- public:
+
-  wxPrintSetupData(void);
+public:
-  ~wxPrintSetupData(void);
+    wxPrintSetupData();
+    ~wxPrintSetupData();
 
     void SetPrinterCommand(const char *cmd);
     void SetPaperName(const char *paper);
@@ -249,19 +248,22 @@ class WXDLLEXPORT wxPrintSetupData: public wxObject
     void SetColour(bool col);
 
     // Get current values
-  char *GetPrinterCommand(void);
+    char *GetPrinterCommand();
-  char *GetPrintPreviewCommand(void);
+    char *GetPrintPreviewCommand();
-  char *GetPrinterOptions(void);
+    char *GetPrinterOptions();
-  char *GetPrinterFile(void);
+    char *GetPrinterFile();
-  char *GetPaperName(void);
+    char *GetPaperName();
-  int GetPrinterOrientation(void);
+    int GetPrinterOrientation();
     void GetPrinterScaling(double* x, double* y);
     void GetPrinterTranslation(long *x, long *y);
-  int GetPrinterMode(void);
+    int GetPrinterMode();
-  char *GetAFMPath(void);
+    char *GetAFMPath();
-  bool GetColour(void);
+    bool GetColour();
 
     void operator=(wxPrintSetupData& data);
+
+private:
+  DECLARE_DYNAMIC_CLASS(wxPrintSetupData)
 };
 
 WXDLLEXPORT_DATA(extern wxPrintSetupData*) wxThePrintSetupData;
@@ -274,32 +276,35 @@ WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = TRUE);
 
 class WXDLLEXPORT wxPrintPaperType: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
+public:
+    wxPrintPaperType(const char *name = (const char *) NULL, int wmm = 0, int hmm = 0, int wp = 0, int hp = 0);
+    ~wxPrintPaperType();
 
- public:
+public:
     int widthMM;
     int heightMM;
     int widthPixels;
     int heightPixels;
     char *pageName;
 
-  wxPrintPaperType(const char *name = (const char *) NULL, int wmm = 0, int hmm = 0, int wp = 0, int hp = 0);
+private:
-  ~wxPrintPaperType(void);
+    DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 
 class WXDLLEXPORT wxPrintPaperDatabase: public wxList
 {
-  DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
+public:
+    wxPrintPaperDatabase();
+    ~wxPrintPaperDatabase();
 
- public:
+    void CreateDatabase();
-  wxPrintPaperDatabase(void);
+    void ClearDatabase();
-  ~wxPrintPaperDatabase(void);
-
-  void CreateDatabase(void);
-  void ClearDatabase(void);
 
     void AddPaperType(const char *name, int wmm, int hmm, int wp, int hp);
     wxPrintPaperType *FindPaperType(const char *name);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;

include/wx/variant.h

@@ -84,20 +84,20 @@ public:
 
 // Construction & destruction
     wxVariant();
-    wxVariant(double val, const wxString& name = wxEmptyString);
+    wxVariant(double val, const wxString& name = g_szNul);
-    wxVariant(long val, const wxString& name = wxEmptyString);
+    wxVariant(long val, const wxString& name = g_szNul);
-    wxVariant(bool val, const wxString& name = wxEmptyString);
+    wxVariant(bool val, const wxString& name = g_szNul);
-    wxVariant(char val, const wxString& name = wxEmptyString);
+    wxVariant(char val, const wxString& name = g_szNul);
-    wxVariant(const wxString& val, const wxString& name = wxEmptyString);
+    wxVariant(const wxString& val, const wxString& name = g_szNul);
-    wxVariant(const char* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool!
+    wxVariant(const char* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool!
-    wxVariant(const wxStringList& val, const wxString& name = wxEmptyString);
+    wxVariant(const wxStringList& val, const wxString& name = g_szNul);
-    wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
+    wxVariant(const wxList& val, const wxString& name = g_szNul); // List of variants
 #if wxUSE_TIMEDATE
-    wxVariant(const wxTime& val, const wxString& name = wxEmptyString); // Time
+    wxVariant(const wxTime& val, const wxString& name = g_szNul); // Time
-    wxVariant(const wxDate& val, const wxString& name = wxEmptyString); // Date
+    wxVariant(const wxDate& val, const wxString& name = g_szNul); // Date
 #endif
-    wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
+    wxVariant(void* ptr, const wxString& name = g_szNul); // void* (general purpose)
-    wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
+    wxVariant(wxVariantData* data, const wxString& name = g_szNul); // User-defined data
     wxVariant(const wxVariant& variant);
     ~wxVariant();
 

include/wx/wxexpr.h

@@ -205,12 +205,12 @@ class WXDLLEXPORT wxExpr
 
 class WXDLLEXPORT wxExprDatabase: public wxList
 {
-  DECLARE_DYNAMIC_CLASS(wxExprDatabase)
+private:
- private:
     wxNode *position;              // Where we are in a search
     wxHashTable *hash_table;
     wxString attribute_to_hash;
- public:
+
+public:
     int noErrors;
 
     wxExprDatabase(wxExprErrorHandler handler = 0);
@@ -258,6 +258,9 @@ class WXDLLEXPORT wxExprDatabase: public wxList
     inline bool ReadProlog(char *filename) { return Read(wxString(filename)); }
     inline bool ReadPrologFromString(char *buffer) { return ReadFromString(wxString(buffer)); }
     inline void WriteProlog(ostream& stream) { Write(stream); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxExprDatabase)
 };
 
 // Function call-style interface - some more convenience wrappers/unwrappers