summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2006-01-13 07:48:24 +0000
committerleo2006-01-13 07:48:24 +0000
commita17d706f3590a49296b2a581840e8177aac77949 (patch)
tree6aad1b726f08c26f3cc2bf01e075be6ffbb94432
parentd710f1fc7763110cf9e7aba26ce221c835f3dcdb (diff)
Linux compile fixes.
git-svn-id: http://svn.leocad.org/trunk@454 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/module.mk2
-rw-r--r--linux/dialogs.cpp29
-rw-r--r--linux/toolbar.cpp2
3 files changed, 14 insertions, 19 deletions
diff --git a/common/module.mk b/common/module.mk
index 793d387..7a0bc63 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -1,6 +1,6 @@
SRC += common/algebra.cpp common/camera.cpp common/console.cpp common/curve.cpp common/file.cpp \
common/globals.cpp common/group.cpp common/image.cpp common/im_bmp.cpp common/im_gif.cpp \
- common/libman.cpp common/library.cpp common/light.cpp common/mainwnd.cpp common/matrix.cpp \
+ common/library.cpp common/light.cpp common/mainwnd.cpp common/matrix.cpp \
common/message.cpp common/minifig.cpp common/object.cpp common/opengl.cpp common/piece.cpp \
common/pieceinf.cpp common/preview.cpp common/project.cpp common/quant.cpp common/str.cpp \
common/terrain.cpp common/texfont.cpp common/texture.cpp common/tr.cpp common/vector.cpp \
diff --git a/linux/dialogs.cpp b/linux/dialogs.cpp
index 95914d4..1de8dd9 100644
--- a/linux/dialogs.cpp
+++ b/linux/dialogs.cpp
@@ -22,7 +22,7 @@
#include "main.h"
#include "config.h"
#include "message.h"
-#include "libman.h"
+#include "project.h"
// =============================================================================
// Modal dialog helper functions
@@ -2768,7 +2768,7 @@ int groupdlg_execute(void* param)
static void librarydlg_update_list (GtkWidget *dlg)
{
- LibraryManager *lib = (LibraryManager*) gtk_object_get_data (GTK_OBJECT (dlg), "lib");
+ PiecesLibrary *lib = project->GetPiecesLibrary();
GtkCTree *ctree = GTK_CTREE (gtk_object_get_data (GTK_OBJECT (dlg), "tree"));
GtkCList *clist = GTK_CLIST (gtk_object_get_data (GTK_OBJECT (dlg), "list"));
int row, sel = GTK_CLIST (ctree)->focus_row;
@@ -2776,19 +2776,16 @@ static void librarydlg_update_list (GtkWidget *dlg)
gtk_clist_freeze (clist);
gtk_clist_clear (clist);
- for (int i = 0; i < lib->GetPieceCount(); i++)
- {
- PieceInfo* info;
- lcuint32 groups;
+ PtrArray<PieceInfo> SinglePieces, GroupedPieces;
+ lib->GetCategoryEntries(sel, false, SinglePieces, GroupedPieces);
- lib->GetPieceInfo (i, &info, &groups);
+ for (int i = 0; i < SinglePieces.GetSize(); i++)
+ {
+ PieceInfo* info = SinglePieces[i];
- if ((sel == 0) || (((1 << (sel-1)) & groups) != 0))
- {
- char *text = info->m_strDescription;
- row = gtk_clist_append (clist, &text);
- gtk_clist_set_row_data (clist, row, GINT_TO_POINTER (i));
- }
+ char *text = info->m_strDescription;
+ row = gtk_clist_append (clist, &text);
+ gtk_clist_set_row_data (clist, row, info);
}
gtk_clist_thaw (clist);
@@ -2798,7 +2795,7 @@ static void librarydlg_update_list (GtkWidget *dlg)
static void librarydlg_update_tree (GtkWidget *dlg)
{
- LibraryManager *lib = (LibraryManager*) gtk_object_get_data (GTK_OBJECT (dlg), "lib");
+ PiecesLibrary *lib = project->GetPiecesLibrary();
GtkCTree *ctree = GTK_CTREE (gtk_object_get_data (GTK_OBJECT (dlg), "tree"));
GtkCTreeNode *parent;
char *text = "Groups";
@@ -2808,9 +2805,9 @@ static void librarydlg_update_tree (GtkWidget *dlg)
parent = gtk_ctree_insert_node (ctree, NULL, NULL, &text, 0, NULL, NULL, NULL, NULL, FALSE, TRUE);
- for (int i = 0; i < lib->GetGroupCount(); i++)
+ for (int i = 0; i < lib->GetNumCategories(); i++)
{
- text = lib->GetGroupName(i);
+ text = lib->GetCategoryName(i);
gtk_ctree_insert_node (ctree, parent, NULL, &text, 0, NULL, NULL, NULL, NULL, TRUE, TRUE);
}
diff --git a/linux/toolbar.cpp b/linux/toolbar.cpp
index 43263ea..daabd55 100644
--- a/linux/toolbar.cpp
+++ b/linux/toolbar.cpp
@@ -314,8 +314,6 @@ static void fill_piecelist(int group)
static void group_event(GtkWidget *widget, gpointer data)
{
fill_piecelist((int)data);
- if (!ignore_commands)
- project->HandleNotify(LC_GROUP_CHANGED, (int)data);
}
void groupsbar_set(int new_group)