compile fix

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

include/wx/odbc.h

@@ -25,19 +25,22 @@
 #endif
 
 
-#ifdef __WXGTK__
+#ifdef __UNIX__
-extern "C" {
+extern "C"
+{
     #include "../../src/iodbc/isql.h"
     #include "../../src/iodbc/isqlext.h"
     #include "../../src/iodbc/odbc_funcs.h"
     #include "../../src/iodbc/odbc_types.h"
+
     typedef float   SFLOAT;
     typedef double  SDOUBLE;
+
     #define ULONG UDWORD
 }
-#else
+#else // !Unix
     #include <sqlext.h>
-#endif
+#endif // Unix/!Unix
 
 #include "wx/defs.h"
 #include "wx/list.h"
@@ -60,9 +63,7 @@ class WXDLLEXPORT wxRecordSet;
 
 class WXDLLEXPORT wxDatabase: public wxObject
 {
-  // JACS
   DECLARE_DYNAMIC_CLASS(wxDatabase)
- private:
  protected:
   static HENV hEnv;
   static int refCount;
@@ -85,11 +86,11 @@ class WXDLLEXPORT wxDatabase: public wxObject
   wxList recordSets; // Record sets: Added by JACS
 
  public:
-  wxDatabase(void);
+  wxDatabase();
-  ~wxDatabase(void);
+  ~wxDatabase();
 
   bool Open(char *, bool exclusive =FALSE, bool readOnly =TRUE, char *username ="ODBC", char *password ="");
-  bool Close(void);
+  bool Close();
 
   // Cleanup operations, added by JACS
   void DeleteRecordSets(void); // Called when the database is deleted
@@ -109,25 +110,25 @@ class WXDLLEXPORT wxDatabase: public wxObject
   void SetDataSource(char *s);
 
   // Database attributes
-  char *GetDatabaseName(void);
+  char *GetDatabaseName();
-  bool CanUpdate(void);
+  bool CanUpdate();
-  bool CanTransact(void);
+  bool CanTransact();
-  bool InWaitForDataSource(void);
+  bool InWaitForDataSource();
   void SetLoginTimeout(long seconds);
   void SetQueryTimeout(long seconds);
   void SetSynchronousMode(bool synchronous);
 
   // Database operations
-  bool BeginTrans(void);
+  bool BeginTrans();
-  bool CommitTrans(void);
+  bool CommitTrans();
-  bool RollbackTrans(void);
+  bool RollbackTrans();
-  void Cancel(void);
+  void Cancel();
 
   // Error handling
-  bool ErrorOccured(void);
+  bool ErrorOccured();
-  char* GetErrorMessage(void);
+  char* GetErrorMessage();
-  long  GetErrorNumber(void);
+  long  GetErrorNumber();
-  char* GetErrorClass(void);
+  char* GetErrorClass();
   inline void ErrorSnapshot(HSTMT =SQL_NULL_HSTMT);
 
   // Overridables
@@ -154,23 +155,23 @@ class WXDLLEXPORT wxQueryField: public wxObject
   long size;
   bool dirty;
 
-  bool AllocData(void);
+  bool AllocData();
 
   public:
-  wxQueryField(void);
+  wxQueryField();
-  ~wxQueryField(void);
+  ~wxQueryField();
 
   bool SetData(void*, long);
   void SetDirty(bool =TRUE);
-  void ClearData(void);
+  void ClearData();
   void SetType(short);
   void SetSize(long);
 
-  void* GetData(void);
+  void* GetData();
-  short GetType(void);
+  short GetType();
-  long GetSize(void);
+  long GetSize();
 
-  bool IsDirty(void);
+  bool IsDirty();
 };
 
 // Represents a column description
@@ -188,8 +189,8 @@ class WXDLLEXPORT wxQueryCol: public wxObject
   public:
   wxList fields;
 
-  wxQueryCol(void);
+  wxQueryCol();
-  ~wxQueryCol(void);
+  ~wxQueryCol();
 
   void* BindVar(void*, long);
   void FillVar(int);
@@ -200,9 +201,9 @@ class WXDLLEXPORT wxQueryCol: public wxObject
   void SetFieldDirty(int, bool =TRUE);
   void SetType(short);
 
-  char* GetName(void);
+  char* GetName();
-  short GetType(void);
+  short GetType();
-  bool IsNullable(void);
+  bool IsNullable();
   void* GetData(int);
   long GetSize(int);
 
@@ -237,43 +238,45 @@ class WXDLLEXPORT wxRecordSet: public wxObject
 
   public:
   // JACS gave parent a default value for benefit of IMPLEMENT_DYNAMIC_CLASS
-  wxRecordSet(wxDatabase *parent = NULL, int =wxOPEN_TYPE_DYNASET, int =wxOPTION_DEFAULT);
+  wxRecordSet(wxDatabase *parent = NULL,
-  ~wxRecordSet(void);
+              int = wxOPEN_TYPE_DYNASET,
+              int = wxOPTION_DEFAULT);
+  ~wxRecordSet();
 
   // My own, lower-level functions.
   bool BeginQuery(int openType, char *sql = NULL, int options = wxOPTION_DEFAULT);
-  bool EndQuery(void);
+  bool EndQuery();
   bool Query(char* columns, char* table =NULL, char *filter =NULL);
 
   // Attributes
   inline int GetNumberFields(void) { return nFields; }
   inline int GetNumberParams(void) { return nParams; }
-  long GetNumberRecords(void);
+  long GetNumberRecords();
-  long GetNumberCols(void);
+  long GetNumberCols();
   inline char *GetFilter(void) { return recordFilter; }
   inline char *GetSortString(void) { return sortString; }
   inline wxDatabase *GetDatabase(void) { return parentdb; }
   inline wxRETCODE GetErrorCode(void) { return retcode; }
-  bool CanAppend(void);
+  bool CanAppend();
-  bool CanRestart(void);
+  bool CanRestart();
-  bool CanScroll(void);
+  bool CanScroll();
-  bool CanTransact(void);
+  bool CanTransact();
-  bool CanUpdate(void);
+  bool CanUpdate();
-  long GetCurrentRecord(void);
+  long GetCurrentRecord();
-  bool RecordCountFinal(void);
+  bool RecordCountFinal();
-  bool GetResultSet(void);
+  bool GetResultSet();
   bool ExecuteSQL(char*);
-  bool GetTables(void);
+  bool GetTables();
   bool GetColumns(char* =NULL);
   bool GetPrimaryKeys(char* =NULL);
   bool GetForeignKeys(char* , char * );
-  char *GetTableName(void);
+  char *GetTableName();
   void SetTableName(char*);
-  char *GetSQL(void);
+  char *GetSQL();
-  bool IsOpen(void);
+  bool IsOpen();
-  bool IsBOF(void);
+  bool IsBOF();
-  bool IsEOF(void);
+  bool IsEOF();
-  bool IsDeleted(void);
+  bool IsDeleted();
 
   bool GetFieldData(int colPos, int dataType, void *dataPtr);
   bool GetFieldData(const char*, int dataType, void *dataPtr);
@@ -286,50 +289,50 @@ class WXDLLEXPORT wxRecordSet: public wxObject
   void* BindVar(const char*, void*, long);
 
   void SetType(int);
-  int GetType(void);
+  int GetType();
   void SetOptions(int);
-  int GetOptions(void);
+  int GetOptions();
 
   // Update operations
-  void AddNew(void);
+  void AddNew();
-  bool Delete(void);
+  bool Delete();
-  void Edit(void);
+  void Edit();
-  bool Update(void);
+  bool Update();
 
   // Record navigation
   virtual bool Move(long rows);
-  virtual bool MoveFirst(void);
+  virtual bool MoveFirst();
-  virtual bool MoveLast(void);
+  virtual bool MoveLast();
-  virtual bool MoveNext(void);
+  virtual bool MoveNext();
-  virtual bool MovePrev(void);
+  virtual bool MovePrev();
   virtual bool GoTo(long);
 
   // Others
-  bool GetDataSources(void);
+  bool GetDataSources();
 
   // Associate a column name/position with a data location
   //   bool BindColumn(int colPos, int dataType, void *dataPtr);
 
-  void Cancel(void);
+  void Cancel();
   bool IsFieldDirty(int);
   bool IsFieldDirty(const char*);
   bool IsFieldNull(int);
   bool IsFieldNull(const char*);
   bool IsColNullable(int);
   bool IsColNullable(const char*);
-  virtual bool Requery(void);
+  virtual bool Requery();
   virtual void SetFieldDirty(int, bool dirty = TRUE);
   virtual void SetFieldDirty(const char*, bool dirty = TRUE);
   void SetFieldNull(void *p, bool isNull = TRUE);
 
   // Overridables
-  virtual char *GetDefaultConnect(void);
+  virtual char *GetDefaultConnect();
-  virtual char *GetDefaultSQL(void);
+  virtual char *GetDefaultSQL();
 
   // Internal
 
   // Build SQL query from column specification
-  bool ConstructDefaultSQL(void);
+  bool ConstructDefaultSQL();
   void SetDefaultSQL(char *s);
   bool ReleaseHandle(void); // Added JACS
 };

samples/html/zip/zip.cpp

@@ -71,10 +71,7 @@
    Minimal_Quit = 1,
    Minimal_About,
    Minimal_Back,
-   Minimal_Forward,
+   Minimal_Forward
-   
-    // controls start here (the numbers are, of course, arbitrary)
-   Minimal_Text = 1000,
    };
 
 // ----------------------------------------------------------------------------

src/common/extended.c

@@ -1,7 +1,5 @@
-#if !defined(__VISAGECPP__)
-#   pragma warning(disable:4001)    /* non standard extension used: single line comment */
-#endif
 #include "wx/setup.h"
+
 #include <math.h>
 
 #if wxUSE_APPLE_IEEE
@@ -85,7 +83,8 @@ void ConvertToIeeeExtended(double num, unsigned char *bytes)
         }
     }
 
-    /* disable the warning about 'possible loss of data' & 'conversion between diff types' */
+    /* disable the warning about 'possible loss of data' & 'conversion between
+     * diff types' */
 #ifdef _MSC_VER
 #pragma warning(disable: 4244)
 #pragma warning(disable: 4135)