[wxCL-cvs] SF.net SVN: wxcl: [510] trunk/wxcl/src

[<efu...@us...>]

Revision: 510
Author:   efuzzyone
Date:     2006-07-04 00:58:26 -0700 (Tue, 04 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/wxcl/?rev=510&view=rev

Log Message:
-----------


Modified Paths:
--------------
    trunk/wxcl/src/defpackage.lisp
    trunk/wxcl/src/dialogs/wizard.lisp
    trunk/wxcl/src/layout/sizer.lisp
Modified: trunk/wxcl/src/defpackage.lisp
===================================================================
--- trunk/wxcl/src/defpackage.lisp	2006-07-04 07:55:35 UTC (rev 509)
+++ trunk/wxcl/src/defpackage.lisp	2006-07-04 07:58:26 UTC (rev 510)
@@ -1997,12 +1997,24 @@
      )
   )
 
+
+
 (in-package :wxCL)
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defconstant +library-name+ "../lib/wxc-msw2.6.2.dll"))
 
-(cffi:load-foreign-library +library-name+)
 
+
+(define-foreign-library libwxcl
+    (:unix (:or "wxc-2.6.2.so" "wxc-2.6.2.so"))
+  (t (:default "../lib/wxc-msw2.6.2.dll")))
+
+(pushnew #P"../lib/" *foreign-library-directories* :test #'equal)
+
+(cffi:use-foreign-library libwxcl)
+
+
+
+
+
 (defconstant +id-open+ 5000)
 (defconstant +id-close+ 5001)
 (defconstant +id-new+ 5002)

Modified: trunk/wxcl/src/dialogs/wizard.lisp
===================================================================
--- trunk/wxcl/src/dialogs/wizard.lisp	2006-07-04 07:55:35 UTC (rev 509)
+++ trunk/wxcl/src/dialogs/wizard.lisp	2006-07-04 07:58:26 UTC (rev 510)
@@ -9,13 +9,12 @@
 
 (in-package :wxcl)
 
-(defun make-wizard (parent &key (id -1) (title "") (bmp nil) (position +default-position+) (size +default-size+))
+(defun make-wizard (parent &key (id -1) (title "") (bmp nil) (position +default-position+) (style 0))
   (make-wx-instance 'wizard (wxWizard_Create (object-pointer parent) id title
                                              (cffi-object-pointer bmp)
                                              (point-x position)
                                              (point-y position)
-                                             (size-width size)
-                                             (size-height size))))
+                                             style)))
 
 (defmethod run-wizard ((obj wizard) page)
   (= 1 (wxWizard_RunWizard (object-pointer obj)(object-pointer page))))
@@ -27,9 +26,9 @@
   (wxWizard_SetPageSize (object-pointer obj) (size-width sz) (size-height sz)))
 
 (defmethod page-size ((obj wizard))
+  "fix method"
   (let (x y)
-    (setf (values x y) (wxWizard_GetPageSize (object-pointer obj)))
-    (make-size x y)))
+    (wxWizard_GetPageSize (object-pointer obj))))
 
 (defun make-wizard-page-simple (parent)
   (make-wx-instance 'wizard-page-simple

Modified: trunk/wxcl/src/layout/sizer.lisp
===================================================================
--- trunk/wxcl/src/layout/sizer.lisp	2006-07-04 07:55:35 UTC (rev 509)
+++ trunk/wxcl/src/layout/sizer.lisp	2006-07-04 07:58:26 UTC (rev 510)
@@ -67,16 +67,19 @@
   (wxSizer_SetItemMinSize (object-pointer obj) pos (size-width size) (size-height size)))
 
 (defmethod size ((obj sizer))
+  "fix me"
   (let (w h)
     (multiple-value-setq (w h) (wxSizer_GetSize (object-pointer obj)))
     (make-instance 'size :width w :height h)))
 
 (defmethod sizer-position ((obj sizer))
+  "fix me"
   (let (w h)
     (multiple-value-setq (w h) (wxSizer_GetPosition (object-pointer obj)))
     (make-instance 'size :width w :height h)))
 
 (defmethod min-size ((obj sizer))
+  "fix me"
   (let (w h)
     (multiple-value-setq (w h) (wxSizer_GetMinSize (object-pointer obj)))
     (make-instance 'size :width w :height h)))
@@ -85,6 +88,7 @@
   (wxSizer_RecalcSizes (object-pointer obj)))
 
 (defmethod calc-min ((obj sizer))
+  "fix me"
   (let (w h)
     (multiple-value-setq (w h) (wxSizer_CalcMin (object-pointer obj)))
     (make-instance 'size :width w :height h)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.