Shared libs now get installed correctly on Linux.

  Fixed a compile bug on bitmap.

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

diff --git a/TODO.txt b/TODO.txt
index add11baea9cff5bad26c36c5a534ee0bc900f17e..4b7c05a7dd186ebde82bec68fbb8d55377d0cfb5 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,52 +1,37 @@
 ********************* TODO list for wxWindows 2 ******************************
 
 ********************* TODO list for wxWindows 2 ******************************
 

-The items are grouped by platform (generic, MSW, GTK...) and inside by
-subject. The first 2 columns containg the following codes:
-
-Priority classification:                Amount of work expected:
-9       next point release                      q       quick fix
-8       next release                            s       small change
-7       as soon as possible                     l       a little work
-6       soon                                    w       some work
-5       should be included                      b       big change
-4       nice to have                            m       major change
-3       consider including                      ?       don't know how to fix
-2       maybe not                               -       unclassified
-1       probably not
--       unclassified
-
-After the subject the name in brackets indicates the person who is going to do
-it.
-

 =============================== common ========================================
 
 =============================== common ========================================
 

-4w wxString optimization (VZ)
-   allocate more memory than needed to avoid reallocation each time when
-   operator+ or += is used.
+wxSocket, wxTCP etc..

 
 

-6b stream classes (VZ)
+wxMultiMedia

 
 =============================== generic  ======================================
 
 
 =============================== generic  ======================================
 

-7s wxTreeCtrl root item (RR)
-   root item is not shown currently (unlike in MSW version)
+wxTreeCtrl keyboard handling
+wxTreeCtrl icon support

 
 

-5w wxImageList
-   it's not implemented currently, to do (assuming that all images have the
-   same size - no resizing should be done to simplify the job)
+wxListCtrl icon support in list mode

 
 ================================ MSW ==========================================
 
 
 ================================ MSW ==========================================
 

-7w consistent keyboard interface and focus behaviour (VZ)
+Consistent keyboard interface and focus behaviour 

    currently, the focus is lost all the time (after a MessageBox, for example)
    and sometimes TABbing through controls doesn't work
 
 ================================ GTK  ==========================================
 
    currently, the focus is lost all the time (after a MessageBox, for example)
    and sometimes TABbing through controls doesn't work
 
 ================================ GTK  ==========================================
 

-9m keyboard interface (RR)
-   TAB traversal, Alt-letter accelerators for the controls and accelerators
-   for menu items - TODO.
-
-3b wxTreeCtrl native implementation?
-   GTK has a GtkCTree widget which seems to be quite close to the Windows
-   standard control - what about writing a native wxTreeCtrl based on it?
+Set fonts in GTK widgets
+Set colour/baclgroundcolour in GTK widgets
+Correct tab navigation (seems to be a GTK feature)
+DnD (postponed as GTK 1.2 will have new DnD)
+Clipboard
+Help system (not sure about this one)
+Show accelerator in menus
+More controls with bitmaps
+Speed up bitmap saving
+wxBitmapHandler
+Fix printing of bitmaps
+TrueType support (just kidding)
+
+wxTreeCtrl not yet finshed

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 7baf8849f35ebdfb8bed0d7f7f3ce3af20a7f007..81406d49ecee9a1fcea68de40ef9f45a0a424282 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -49,6 +49,8 @@ class wxMask: public wxObject
     GdkBitmap *GetBitmap() const;
 
   protected:
     GdkBitmap *GetBitmap() const;
 
   protected:

+  
+    friend wxBitmap;

 
     GdkBitmap *m_bitmap;
 
 
     GdkBitmap *m_bitmap;
 

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 7baf8849f35ebdfb8bed0d7f7f3ce3af20a7f007..81406d49ecee9a1fcea68de40ef9f45a0a424282 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -49,6 +49,8 @@ class wxMask: public wxObject
     GdkBitmap *GetBitmap() const;
 
   protected:
     GdkBitmap *GetBitmap() const;
 
   protected:

+  
+    friend wxBitmap;

 
     GdkBitmap *m_bitmap;
 
 
     GdkBitmap *m_bitmap;
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 0f3b3378aa8804347c968e9b6c9d0977dc8c749b..02b147b1336dcd1b3d6c47cb7f1f80b5bbe92a9b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -81,7 +81,9 @@ install::
        @echo "  Copying shared library"
        @cd $(WXBASEDIR)/lib/$(OS) ; \
          rm -f $(libdir)/$(SHARED_LIBRARY) ; \
        @echo "  Copying shared library"
        @cd $(WXBASEDIR)/lib/$(OS) ; \
          rm -f $(libdir)/$(SHARED_LIBRARY) ; \

-         $(INSTALL_PROGRAM) $(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY)
+         $(INSTALL_PROGRAM) $(SHARED_LIBRARY) $(libdir)/$(SHARED_LIBRARY) ; \
+         $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so.$(LIB_MAJOR) ; \
+         $(LN_S) $(SHARED_LIBRARY) $(libdir)/lib$(LIB_TARGET).so

        @echo " "
        @echo "Installation complete. You may have to run ldconfig!"
        @echo " "
        @echo " "
        @echo "Installation complete. You may have to run ldconfig!"
        @echo " "

diff --git a/wx-config.in b/wx-config.in
index 21b379e1b5d2dc6b9c517c5b3b7447a65969c351..0dbdbca3be47d3fc39817e84c565357383d95eb4 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,7 +36,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
       echo $exec_prefix
       ;;
     --version)

-      echo @WXGTK_VERSION@
+      echo 1.93

       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then
       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then